Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 7 Aug 2006 17:26:49 +0000 (10:26 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 7 Aug 2006 17:26:49 +0000 (10:26 -0700)

Trivial merge