2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 19:53:59 +08:00
linux-next/arch/mn10300
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
..
boot inflate: refactor inflate malloc code 2008-07-25 10:53:28 -07:00
configs mn10300: update the ASB2303 defconfig 2010-01-11 09:34:10 -08:00
include/asm Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
kernel Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2010-05-19 17:10:06 -07:00
lib mn10300: add cc clobbers to asm statements 2010-01-11 09:34:10 -08:00
mm mn10300: invoke oom-killer from page fault 2010-06-04 15:21:44 -07:00
oprofile MN10300: Kill MN10300's own profiling Kconfig 2009-04-09 10:53:16 -07:00
proc-mn103e010 Separate out the proc- and unit-specific header directories from the general 2009-04-10 14:33:48 +01:00
unit-asb2303 mn10300: fix kernel build failures when using gcc-4.x 2009-10-01 16:11:12 -07:00
unit-asb2305 PCI: clear bridge resource range if BIOS assigned bad one 2010-06-11 13:24:51 -07:00
Kconfig time: Kill off CONFIG_GENERIC_TIME 2010-07-27 12:40:54 +02:00
Kconfig.debug MN10300: Add built-in testing for misalignment handler 2008-11-12 10:41:17 -08:00
Makefile mn10300: objcopy flags fix 2010-01-11 09:34:09 -08:00