diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 11:20:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 11:20:11 -0700 |
| commit | 0ca9caae2d05ee0c4878aa3e2619cd23f4ad4cb4 (patch) | |
| tree | 93323b1f7146aefb1843cb995def6c09613bb363 /arch/m32r/kernel/entry.S | |
| parent | 6bf1f75bc6dabc357a29e3b3d6bd4ff00c3d5e6e (diff) | |
| parent | 75e9de18f079a51fa987ef0703112d5bc125fdb7 (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] stacktrace bug.
[S390] cio: remove casts from/to (void *).
[S390] cio: Remove grace period for vary off chpid.
[S390] cio: Use ccw_dev_id and subchannel_id in ccw_device_private
[S390] monwriter kzalloc size.
[S390] cio: add missing KERN_INFO printk header.
[S390] irq change improvements.
Diffstat (limited to 'arch/m32r/kernel/entry.S')
0 files changed, 0 insertions, 0 deletions