diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-04 12:32:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-04 12:32:42 -0800 |
| commit | 741f21e811752b440c505bf0149c4d16e9f3160d (patch) | |
| tree | bf5726d45f799754d91446bbdfe78118deb4c266 /drivers/lguest/segments.c | |
| parent | d4d3b19212a1045ff8224e680375076b3677ede7 (diff) | |
| parent | cc4707b31198d27baae650db1721a2f05701db37 (diff) | |
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/segments.c')
0 files changed, 0 insertions, 0 deletions