Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6