alistair23-linux/arch/cris
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
..
arch-v10 CRIS: Correct address of the romfs in boot image 2010-08-04 12:59:43 +02:00
arch-v32 Merge branch 'for-linus' of git://www.jni.nu/cris 2010-08-08 10:08:26 -07:00
boot CRIS: Discard .note.gnu.build-id section 2010-08-04 13:02:33 +02:00
configs CRIS: proper defconfig setup 2008-10-13 21:34:55 +02:00
include Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
kernel CRIS: Fix alignment problem for older ld 2010-08-04 18:30:01 +02:00
mm CRIS: Always dump registers for segfaulting process. 2010-08-04 18:28:49 +02:00
Kconfig Merge branch 'for-linus' of git://www.jni.nu/cris 2010-08-08 10:08:26 -07:00
Kconfig.debug CRIS: Add config for pausing a seg-faulting process 2010-08-04 18:28:48 +02:00
Makefile arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0 2009-09-20 12:28:22 +02:00