1
0
Fork 0
alistair23-linux/fs/hpfs
Linus Torvalds 82279e6bd7 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})
2010-10-31 20:40:24 -04:00
..
Kconfig BKL: introduce CONFIG_BKL. 2010-10-21 15:44:13 +02:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
alloc.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
anode.c sanitize signedness/const for pointers to char in hpfs a bit 2010-03-03 14:07:57 -05:00
buffer.c hpfs: Convert sbi->hpfs_creation_de to mutex 2010-10-30 10:12:03 +02:00
dentry.c sanitize signedness/const for pointers to char in hpfs a bit 2010-03-03 14:07:57 -05:00
dir.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
dnode.c sanitize signedness/const for pointers to char in hpfs a bit 2010-03-03 14:07:57 -05:00
ea.c sanitize signedness/const for pointers to char in hpfs a bit 2010-03-03 14:07:57 -05:00
file.c get rid of cont_write_begin_newtrunc 2010-08-09 16:47:31 -04:00
hpfs.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
hpfs_fn.h hpfs: Convert sbi->hpfs_creation_de to mutex 2010-10-30 10:12:03 +02:00
inode.c switch hpfs to ->evict_inode() 2010-08-09 16:48:17 -04:00
map.c sanitize signedness/const for pointers to char in hpfs a bit 2010-03-03 14:07:57 -05:00
name.c sanitize signedness/const for pointers to char in hpfs a bit 2010-03-03 14:07:57 -05:00
namei.c Don't mess with generic_permission() under ->d_lock in hpfs 2010-03-03 14:07:58 -05:00
super.c 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 2010-10-31 20:40:24 -04:00