5caaaf6a40c4beb76181c5c00578e4a11c35c27
parent f6b80769109d5b2d9291dd788f4c250cc8b7a55b
parent 01db9953a70e8ad33fbcf91d629f8a8ee59b3484
author Paul Mackerras <paulus@samba.org> 1192624243 +1000
committer Paul Mackerras <paulus@samba.org> 1192624243 +1000

Merge branch 'fixes-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge