summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb8430a 4600d7c 4882720)
raw | combined (merge: bb8430a 4600d7c 4882720)
author | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 1 Nov 2010 00:40:24 +0000 (20:40 -0400) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 1 Nov 2010 00:40:24 +0000 (20:40 -0400) |
* '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})
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})
1 | 2 | 3 | |||
---|---|---|---|---|---|
drivers/staging/smbfs/inode.c | patch | | diff1 | | diff2 | | diff3 | | blob | history |
fs/hpfs/super.c | patch | | diff1 | | diff2 | | diff3 | | blob | history |
diff --cc drivers/staging/smbfs/inode.c
Simple merge
diff --cc fs/hpfs/super.c
Simple merge