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	Merge branch 'master' into for-next	15 years ago
configs	sparc64: Update defconfig.	15 years ago
include/asm	Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block	15 years ago
kernel	sparc64: Fix perf_arch_get_caller_regs().	15 years ago
lib	sparc64: Allocate sufficient stack space in ftrace stubs.	15 years ago
math-emu	Revert "endian: #define __BYTE_ORDER"	15 years ago
mm	kmap_atomic: make kunmap_atomic() harder to misuse	15 years ago
oprofile	sparc: using HZ needs an include of linux/param.h	16 years ago
prom	sparc64: Make prom entry spinlock NMI safe.	15 years ago
Kconfig	Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	15 years ago
Kconfig.debug	sparc: Kill user copy check code.	15 years ago
Makefile	sparc: Set UTS_MACHINE correctly.	15 years ago