Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

Browse source

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] tape_3590.c: introduce missing kfree
  [S390] Fix __ctl_load/__ctl_store inline assembly constraints
  [S390] Fix build failure in __cpu_up()
  [S390] vt220 console, initialize list head before use
  [S390] cio: Fix inverted isc priorities.
  [S390] vmemmap: fix off-by-one bug.
  [S390] cio: Fix sparse warnings in blacklist.c.
  [S390] sparsemem: use SPARSEMEM_STATIC if !64BIT.

...

This commit is contained in:

Linus Torvalds 2008-06-10 08:00:40 -07:00

parent c592713b3e 1783e60ff2

commit 19f2b8dfea

8 changed files with 23 additions and 19 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/s390/Kconfig

View file

2

arch/s390/kernel/smp.c

View file

2

arch/s390/mm/vmem.c

View file

1

drivers/s390/char/sclp_vt220.c

View file

2

drivers/s390/char/tape_3590.c

View file

6

drivers/s390/cio/blacklist.c

View file

20

drivers/s390/cio/cio.c

View file

8

include/asm-s390/system.h

View file