You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		15 years ago
..
boot	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
include/asm	Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block	15 years ago
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	15 years ago
lib	remove __attribute_used__	17 years ago
math-emu	Revert "endian: #define __BYTE_ORDER"	15 years ago
mm	alpha: invoke oom-killer from page fault	15 years ago
oprofile	oprofile: more whitespace fixes	17 years ago
Kconfig	time: Kill off CONFIG_GENERIC_TIME	15 years ago
Kconfig.debug	alpha/parisc: remove config variable DEBUG_RWLOCK	17 years ago
Makefile	alpha: link failure fix	17 years ago
defconfig	alpha/parisc: remove config variable DEBUG_RWLOCK	17 years ago