diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-19 08:07:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-19 08:07:08 -0700 |
| commit | 710675d3609b1123a40db1eb28bf34041b1d37f2 (patch) | |
| tree | 699beb7fe0bfccdce504613a2ce2fdb6d69a818a /arch/sh/kernel/traps.c | |
| parent | a289bbe27785a5f47dc501fa2bc18edfec147117 (diff) | |
| parent | dc74d7f996b465d8a95033c753d34c8b4c01c9d7 (diff) | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Move psw_set_key.
[S390] Add oops_enter()/oops_exit() calls to die().
[S390] Print list of modules on die().
[S390] Fix yet another two section mismatches.
[S390] Fix zfcpdump header
[S390] Missing blank when appending cio_ignore kernel parameter
Diffstat (limited to 'arch/sh/kernel/traps.c')
0 files changed, 0 insertions, 0 deletions