diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-31 20:40:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-31 20:40:24 -0400 |
| commit | 82279e6bd7643da1b3fbda42555c3238c7b00d38 (patch) | |
| tree | e3f846e0a7daf6966375809ff4317f9eb57a9af9 /lib/zlib_deflate/deflate.c | |
| parent | bb8430a2c8fe2b726033017daadf73c69b0348ea (diff) | |
| parent | 4600d7c493f354a3e338a35bcf8a3bfbe815776a (diff) | |
| parent | 4882720b267b7b1d1b0ce08334b205f0329d4615 (diff) | |
Merge branches 'irq-core-for-linus' and 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
genirq: Fix up irq_node() for irq_data changes.
genirq: Add single IRQ reservation helper
genirq: Warn if enable_irq is called before irq is set up
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
semaphore: Remove mutex emulation
staging: Final semaphore cleanup
jbd2: Convert jbd2_slab_create_sem to mutex
hpfs: Convert sbi->hpfs_creation_de to mutex
Fix up trivial change/delete conflicts with deleted 'dream' drivers
(drivers/staging/dream/camera/{mt9d112.c,mt9p012_fox.c,mt9t013.c,s5k3e2fx.c})