Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/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
This commit is contained in:
Linus Torvalds 2010-01-04 12:32:42 -08:00
commit 741f21e811
9 changed files with 254 additions and 302 deletions