Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jan 2010 20:32:42 +0000 (12:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jan 2010 20:32:42 +0000 (12:32 -0800)
commit741f21e811752b440c505bf0149c4d16e9f3160d
treebf5726d45f799754d91446bbdfe78118deb4c266
parentd4d3b19212a1045ff8224e680375076b3677ede7
parentcc4707b31198d27baae650db1721a2f05701db37
Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6

* '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