Linus Torvalds 2f9e825d3e Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block ... * 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block: (149 commits) block: make sure that REQ_* types are seen even with CONFIG_BLOCK=n xen-blkfront: fix missing out label blkdev: fix blkdev_issue_zeroout return value block: update request stacking methods to support discards block: fix missing export of blk_types.h writeback: fix bad _bh spinlock nesting drbd: revert "delay probes", feature is being re-implemented differently drbd: Initialize all members of sync_conf to their defaults [Bugz 315] drbd: Disable delay probes for the upcomming release writeback: cleanup bdi_register writeback: add new tracepoints writeback: remove unnecessary init_timer call writeback: optimize periodic bdi thread wakeups writeback: prevent unnecessary bdi threads wakeups writeback: move bdi threads exiting logic to the forker thread writeback: restructure bdi forker loop a little writeback: move last_active to bdi writeback: do not remove bdi from bdi_list writeback: simplify bdi code a little writeback: do not lose wake-ups in bdi threads ... Fixed up pretty trivial conflicts in drivers/block/virtio_blk.c and drivers/scsi/scsi_error.c as per Jens.		2010-08-10 15:22:42 -07:00
..
8253pit.h	time: move PIT_TICK_RATE to linux/timex.h	2009-06-16 19:47:27 -07:00
a.out-core.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
a.out.h	alpha: introduce field 'taso' into struct linux_binprm	2008-10-16 11:21:38 -07:00
agp_backend.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
agp.h	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
asm-offsets.h	kbuild: move asm-offsets.h to include/generated	2009-12-12 13:08:14 +01:00
atomic.h	atomic_t: Cast to volatile when accessing atomic variables	2010-05-17 07:57:27 -07:00
auxvec.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
barrier.h	alpha: futex implementation	2009-05-02 15:36:10 -07:00
bitops.h	alpha: fix __arch_hweight32 typo	2010-06-15 14:19:07 -04:00
bitsperlong.h	asm-generic: introduce asm/bitsperlong.h	2009-06-11 21:02:14 +02:00
bug.h	alpha: Convert BUG() to use unreachable()	2009-12-18 01:14:52 -05:00
bugs.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
byteorder.h	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
cache.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
cacheflush.h	block: add helpers to run flush_dcache_page() against a bio and a request's pages	2009-11-26 09:16:19 +01:00
checksum.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
compiler.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
console.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
core_apecs.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
core_cia.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
core_irongate.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
core_lca.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
core_marvel.h	alpha: fix compile errors in dma-mapping-common.h	2010-03-18 22:35:28 -04:00
core_mcpcia.h	alpha: fix compile errors in dma-mapping-common.h	2010-03-18 22:35:28 -04:00
core_polaris.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
core_t2.h	alpha: Fix fallout from locking changes	2009-12-14 23:55:32 +01:00
core_titan.h	alpha: fix compile errors in dma-mapping-common.h	2010-03-18 22:35:28 -04:00
core_tsunami.h	alpha: fix compile errors in dma-mapping-common.h	2010-03-18 22:35:28 -04:00
core_wildfire.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
cputime.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
current.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
delay.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
device.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
div64.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
dma-mapping.h	dma-mapping: alpha: use include/linux/pci-dma-compat.h	2010-03-12 15:52:42 -08:00
dma.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
elf.h	elf: kill USE_ELF_CORE_DUMP	2009-12-16 07:20:12 -08:00
emergency-restart.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
err_common.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
err_ev6.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
err_ev7.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
errno.h	cfg80211: errno.h: define ERFKILL	2009-06-07 05:01:00 -07:00
fb.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
fcntl.h	fix up O_SYNC comments	2009-12-17 11:03:24 -05:00
floppy.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
fpu.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
ftrace.h	tracing: make CALLER_ADDRx overwriteable	2009-03-02 16:49:37 -05:00
futex.h	alpha: futex implementation	2009-05-02 15:36:10 -07:00
gct.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
gentrap.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
hardirq.h	alpha: convert to asm-generic/hardirq.h	2009-09-22 07:17:43 -07:00
hw_irq.h	alpha: add performance monitor interrupt counter	2010-08-09 20:45:03 -07:00
hwrpb.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
io_trivial.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
io.h	alpha: remove dead BIO_VMERGE_BOUNDARY	2008-12-29 08:29:51 +01:00
ioctl.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
ioctls.h	tty: Add EXTPROC support for LINEMODE	2010-08-10 13:47:39 -07:00
ipcbuf.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
irq_regs.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
irq.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
jensen.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
Kbuild	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
kdebug.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
kmap_types.h	kmap_types: make most arches use generic header file	2009-06-16 19:47:51 -07:00
linkage.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
local64.h	arch: Implement local64_t	2010-06-09 11:12:36 +02:00
local.h	local_t: Remove cpu_local_xx macros	2010-01-05 15:34:49 +09:00
machvec.h	alpha: convert u64 to unsigned long long	2009-04-01 08:59:16 -07:00
mc146818rtc.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
mman.h	mm: add MAP_HUGETLB for mmaping pseudo-anonymous huge page regions	2009-09-22 07:17:41 -07:00
mmu_context.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
mmu.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
mmzone.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
module.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
msgbuf.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
mutex.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
page.h	asm-generic: rename page.h and uaccess.h	2009-06-11 21:02:17 +02:00
pal.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
param.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
parport.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
pci.h	dma-mapping: alpha: use include/linux/pci-dma-compat.h	2010-03-12 15:52:42 -08:00
percpu.h	alpha: fix percpu build breakage	2009-06-30 18:55:59 -07:00
perf_event.h	alpha: implement HW performance events on the EV67 and later CPUs	2010-08-09 20:45:04 -07:00
pgalloc.h	alpha: make pte_alloc_one_kernel() inline	2009-01-15 16:39:40 -08:00
pgtable.h	MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself	2010-02-20 16:41:46 +00:00
poll.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
posix_types.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
processor.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
ptrace.h	alpha: use generic ptrace_resume code	2010-03-12 15:52:38 -08:00
reg.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
regdef.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
resource.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
rtc.h	alpha: fix RTC on marvel	2009-01-15 16:39:40 -08:00
rwsem.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
scatterlist.h	remove needless ISA_DMA_THRESHOLD	2010-08-07 18:15:50 +02:00
sections.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
segment.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
sembuf.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
serial.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
setup.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
sfp-machine.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
shmbuf.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
shmparam.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
sigcontext.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
siginfo.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
signal.h	asm-generic: rename termios.h, signal.h and mman.h	2009-06-11 21:01:52 +02:00
smp.h	cpumask: remove arch_send_call_function_ipi	2009-09-24 09:34:47 +09:30
socket.h	net: Generalize socket rx gap / receive queue overflow cmsg	2009-10-12 13:26:31 -07:00
sockios.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
spinlock_types.h	locking: Convert raw_rwlock to arch_rwlock	2009-12-14 23:55:32 +01:00
spinlock.h	locking: Convert raw_rwlock functions to arch_rwlock	2009-12-14 23:55:32 +01:00
stat.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
statfs.h	headers_check fix: alpha, statfs.h	2009-02-01 11:01:22 +05:30
string.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
swab.h	headers_check fix: alpha, swab.h	2009-02-01 11:01:22 +05:30
sysinfo.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
system.h	alpha: xchg/cmpxchg cleanup and fixes	2009-04-01 08:59:16 -07:00
termbits.h	tty: Add EXTPROC support for LINEMODE	2010-08-10 13:47:39 -07:00
termios.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
thread_info.h	add descriptive comment for TIF_MEMDIE task flag declaration.	2010-05-14 11:13:27 +02:00
timex.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
tlb.h	mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()	2009-07-27 12:10:38 -07:00
tlbflush.h	alpha: switch to dynamic percpu allocator	2009-06-24 15:13:52 +09:00
topology.h	alpha: cpumask_of_node() should handle -1 as a node	2010-01-14 13:21:35 -05:00
types.h	asm-generic: introduce asm/bitsperlong.h	2009-06-11 21:02:14 +02:00
uaccess.h	alpha: exception table sorting	2009-05-02 15:36:10 -07:00
ucontext.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
unaligned.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
unistd.h	alpha: Add minimal support for software performance events	2009-12-18 01:11:30 -05:00
user.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
vga.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00
wrperfmon.h	alpha: add wrperfmon.h header file to aid use of wrperfmon PALcall	2010-08-09 20:45:04 -07:00
xchg.h	alpha: xchg/cmpxchg cleanup and fixes	2009-04-01 08:59:16 -07:00
xor.h	alpha: move include/asm-alpha to arch/alpha/include/asm	2008-08-15 09:19:40 -07:00