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

Browse source

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] Update default configuration.
  [S390] arch/s390/kvm: Use GFP_ATOMIC when a lock is held
  [S390] kprobes: add parameter check to module_free()
  [S390] appldata/extmem/kvm: add missing GFP_KERNEL flag

...

This commit is contained in:

Linus Torvalds 2010-06-08 18:13:24 -07:00

parent d87815cb20 40a510ddc5

commit fbe33a7c3f

7 changed files with 31 additions and 25 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

2

arch/s390/appldata/appldata_os.c

View file

23

arch/s390/defconfig

View file

6

arch/s390/kernel/module.c

View file

2

arch/s390/kvm/kvm-s390.c

View file

2

arch/s390/kvm/sigp.c

View file

19

arch/s390/mm/extmem.c

View file

2

drivers/s390/cio/itcw.c

View file