Linus Torvalds d3594ea2b3 Merge branch 'block-dev' ... Merge 'block-dev' branch. I was going to just mark everything here for stable and leave it to the 3.8 merge window, but having decided on doing another -rc, I migth as well merge it now. This removes the bd_block_size_semaphore semaphore that was added in this release to fix a race condition between block size changes and block IO, and replaces it with atomicity guaratees in fs/buffer.c instead, along with simplifying fs/block-dev.c. This removes more lines than it adds, makes the code generally simpler, and avoids the latency/rt issues that the block size semaphore introduced for mount. I'm not happy with the timing, but it wouldn't be much better doing this during the merge window and then having some delayed back-port of it into stable. * block-dev: blkdev_max_block: make private to fs/buffer.c direct-io: don't read inode->i_blkbits multiple times blockdev: remove bd_block_size_semaphore again fs/buffer.c: make block-size be per-page and protected by the page lock		2012-12-03 10:53:25 -08:00
..
agp	Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes	2012-10-16 10:11:59 +10:00
hw_random	IXP4xx: HW pseudo-random generator is available on IXP45x/46x only.	2012-11-22 03:35:39 +00:00
ipmi	IPMI: Detect register spacing on PCI interfaces	2012-10-16 18:07:12 -07:00
mwave	8250: three way resolve of the 8250 diffs	2012-07-17 09:11:50 -07:00
pcmcia	TTY merge for 3.7-rc1	2012-10-01 12:26:52 -07:00
tpm	Merge branch 'tpmdd-next-v3.6' of git://github.com/shpedoikal/linux into for-linus	2012-10-11 18:41:29 +08:00
xilinx_hwicap	xilinx_hwicap: reset XHI_MAX_RETRIES	2012-04-19 19:09:18 -07:00
apm-emulation.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm	2012-04-05 17:34:30 -07:00
applicom.c	drivers/char/applicom.c: fix information leak to userland	2010-10-27 18:03:14 -07:00
applicom.h
bfin-otp.c
bsr.c	powerpc/BSR: cleanup the error path of bsr_init	2012-07-17 10:27:38 -07:00
ds1302.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
ds1620.c	ARM: footbridge: nw_gpio_lock is raw_spin_lock	2012-10-07 10:33:12 +02:00
dsp56k.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:52:56 -07:00
dtlk.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:52:56 -07:00
efirtc.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
generic_nvram.c	drivers: fix up various ->llseek() implementations	2011-07-20 20:47:58 -04:00
genrtc.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
hangcheck-timer.c
hpet.c	printk(): add KERN_CONT where needed in hpet and vt code	2012-04-09 10:30:39 -07:00
i8k.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
Kconfig	char/misc: remove CONFIG_EXPERIMENTAL dependencies	2012-09-18 16:14:53 +01:00
lp.c	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 18:12:23 -07:00
Makefile	IPMI: Change link order	2012-10-16 18:07:12 -07:00
mbcs.c	mm: kill vma flag VM_RESERVED and mm->reserved_vm counter	2012-10-09 16:22:19 +09:00
mbcs.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
mem.c	mm: kill vma flag VM_RESERVED and mm->reserved_vm counter	2012-10-09 16:22:19 +09:00
misc.c	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
mmtimer.c	drivers/char/mmtimer.c: Remove useless kfree	2012-09-26 13:20:40 -07:00
msm_smd_pkt.c	drivers/char/msm_smd_pkt.c: don't use IS_ERR()	2011-08-25 16:25:33 -07:00
mspec.c	mm: kill vma flag VM_RESERVED and mm->reserved_vm counter	2012-10-09 16:22:19 +09:00
nsc_gpio.c
nvram.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
nwbutton.c	drivers/char: removes unnecessary semicolon	2012-09-26 13:20:39 -07:00
nwbutton.h
nwflash.c	Merge branch 'late/fixes' into fixes	2012-10-07 07:22:32 -07:00
pc8736x_gpio.c
ppdev.c	ppdev: ppdev_init: do not return zero in case of failure	2012-09-05 13:44:04 -07:00
ps3flash.c	drivers/char: Add module.h to those who were using it implicitly	2011-10-31 19:31:40 -04:00
random.c	random: mix in architectural randomness in extract_buf()	2012-07-27 22:37:20 -04:00
raw.c	blockdev: remove bd_block_size_semaphore again	2012-11-29 10:52:19 -08:00
rtc.c	drivers/char: removes unnecessary semicolon	2012-09-26 13:20:39 -07:00
scx200_gpio.c
snsc_event.c
snsc.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:52:56 -07:00
snsc.h	headers: kobject.h redux	2011-01-10 08:51:44 -08:00
sonypi.c	sonypi: suspend/resume callbacks should be conditionally compiled on CONFIG_PM_SLEEP	2012-10-25 12:05:50 -07:00
tb0219.c
tile-srom.c	tile-srom.c driver: minor code cleanup	2012-04-02 12:14:10 -04:00
tlclk.c	drivers/char/tlclk.c: fix error return code	2012-08-16 10:09:15 -07:00
toshiba.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:52:56 -07:00
ttyprintk.c	TTY: tty_alloc_driver() returns error pointers	2012-08-16 12:07:23 -07:00
uv_mmtimer.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
virtio_console.c	virtio: console: fix error handling in init() function	2012-09-28 15:05:13 +09:30