Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorAdrian Bunk <bunk@stusta.de>
Sun, 2 Apr 2006 08:37:38 +0000 (10:37 +0200)
committerAdrian Bunk <bunk@stusta.de>
Sun, 2 Apr 2006 08:37:38 +0000 (10:37 +0200)

Trivial merge