Merge branch 'cell-merge' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6
authorPaul Mackerras <paulus@samba.org>
Wed, 20 Dec 2006 05:22:53 +0000 (16:22 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 20 Dec 2006 05:22:53 +0000 (16:22 +1100)

Trivial merge