diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-15 12:48:44 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-15 12:48:44 +0200 |
commit | 6b2ada82101a08e2830fb29d7dc9b858be637dd4 (patch) | |
tree | c0580c250211f8773674f3a4f7cd575818f153cc /drivers/char/nwflash.c | |
parent | Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 (diff) | |
parent | softlockup: Documentation/sysctl/kernel.txt: fix softlockup_thresh description (diff) | |
parent | softirq, warning fix: correct a format to avoid a warning (diff) | |
parent | x86, pci-hotplug, calgary / rio: fix EBDA ioremap() (diff) | |
parent | printk: robustify printk, update comment (diff) | |
parent | do_generic_file_read: s/EINTR/EIO/ if lock_page_killable() fails (diff) | |
download | linux-6b2ada82101a08e2830fb29d7dc9b858be637dd4.tar.xz linux-6b2ada82101a08e2830fb29d7dc9b858be637dd4.zip |
Merge branches 'core/softlockup', 'core/softirq', 'core/resources', 'core/printk' and 'core/misc' into core-v28-for-linus