Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorTim Shimmin <tes@chook.melbourne.sgi.com>
Fri, 29 Sep 2006 06:45:43 +0000 (16:45 +1000)
committerTim Shimmin <tes@chook.melbourne.sgi.com>
Fri, 29 Sep 2006 06:45:43 +0000 (16:45 +1000)

Trivial merge