Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorAdrian Bunk <bunk@r063144.stusta.swh.mhn.de>
Mon, 20 Mar 2006 17:30:36 +0000 (18:30 +0100)
committerAdrian Bunk <bunk@r063144.stusta.swh.mhn.de>
Mon, 20 Mar 2006 17:30:36 +0000 (18:30 +0100)

Trivial merge