Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-arm
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 21 Aug 2006 21:38:51 +0000 (14:38 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 21 Aug 2006 21:38:51 +0000 (14:38 -0700)

Trivial merge