diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-04 21:32:42 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-04 21:32:42 +0100 |
commit | 741f21e811752b440c505bf0149c4d16e9f3160d (patch) | |
tree | bf5726d45f799754d91446bbdfe78118deb4c266 /drivers/lguest | |
parent | Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | [S390] Update default configuration. (diff) | |
download | linux-741f21e811752b440c505bf0149c4d16e9f3160d.tar.xz linux-741f21e811752b440c505bf0149c4d16e9f3160d.zip |
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
Diffstat (limited to 'drivers/lguest')
0 files changed, 0 insertions, 0 deletions