tree 52bb17e20f4ad7a3862d014cf75c9d84f095ea7a
parent b22da92f2cf52b3c51dd9a45abb658b1414b0784
parent de0c74e7f98d8a06b784e120103eb388da8194f6
author Paul Mackerras <paulus@samba.org> 1195527286 +1100
committer Paul Mackerras <paulus@samba.org> 1195527286 +1100

Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi into merge