Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 16 Aug 2006 15:51:04 +0000 (08:51 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 16 Aug 2006 15:51:04 +0000 (08:51 -0700)

Trivial merge