Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorKarsten Keil <kkeil@suse.de>
Mon, 12 Jan 2009 12:16:17 +0000 (13:16 +0100)
committerKarsten Keil <kkeil@suse.de>
Mon, 12 Jan 2009 12:16:17 +0000 (13:16 +0100)

Trivial merge