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

Trivial merge