Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux...
authorPaul Mackerras <paulus@samba.org>
Wed, 27 Sep 2006 21:18:28 +0000 (07:18 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 27 Sep 2006 21:18:28 +0000 (07:18 +1000)

Trivial merge