Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
authorPaul Mackerras <paulus@samba.org>
Mon, 24 Nov 2008 00:53:44 +0000 (11:53 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 24 Nov 2008 00:53:44 +0000 (11:53 +1100)
commit11bac8a026dd38380b52a914ec9bf65fb2ad13e2
tree16ad0b9cb3e74383062ed664733494633bbd43a7
parente871809cccc11aaa072afaf746f8fd946d2d9cac
parentc8d698849e135780738c2cb08f07f06eda982a8c
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge