Linus Torvalds [Mon, 4 Jan 2010 20:32:42 +0000 (12:32 -0800)]
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] Update default configuration.
[S390] Have param.h simply include <asm-generic/param.h>.
[S390] qdio: convert global statistics to per-device stats