Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...
commit35d77ef1c05bc3760427954dafaee3ca550542f3
authorPaul Mackerras <paulus@samba.org>
Mon, 3 Mar 2008 06:38:23 +0000 (3 17:38 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 3 Mar 2008 06:38:23 +0000 (3 17:38 +1100)
tree0640a1080e5ae68d84500a05543d357f65099288
parent4187377b2411d43ea4470b35162917a5093857bf
parentf62f2fdd9c33160584b800da8c4a25ff1679225a
Merge branch 'for-2.6.25' of /linux/kernel/git/jwboyer/powerpc-4xx into merge