Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-arm
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 10 Aug 2006 22:07:17 +0000 (15:07 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 10 Aug 2006 22:07:17 +0000 (15:07 -0700)

Trivial merge