1
0
Fork 0
remarkable-linux/arch/score/include/asm
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
..
Kbuild score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
asm-offsets.h score: add asm/asm-offsets.h wrapper 2009-12-12 13:08:16 +01:00
asmmacro.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
atomic.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
auxvec.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
bitops.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
bitsperlong.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
bug.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
bugs.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
byteorder.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
cache.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
cacheflush.h score: add flush_dcahce_page and PG_dcache_dirty define 2009-12-17 18:28:31 +08:00
checksum.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
cputime.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
current.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
delay.h score: include asm-generic/param.h in asm/delay.h. 2009-12-17 18:31:23 +08:00
device.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
div64.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
dma-mapping.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
dma.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
elf.h elf: kill USE_ELF_CORE_DUMP 2009-12-16 07:20:12 -08:00
emergency-restart.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
errno.h score: update files according to review comments 2009-06-19 11:40:13 +02:00
fcntl.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
fixmap.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
ftrace.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
futex.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
hardirq.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
hw_irq.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
io.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
ioctl.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
ioctls.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
ipcbuf.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
irq.h score: update inconsistent declare after .c was changed 2009-08-30 12:30:16 +08:00
irq_regs.h score: update inconsistent declare after .c was changed 2009-08-30 12:30:16 +08:00
irqflags.h score: remove unused code, add include files in .c 2009-08-30 12:26:32 +08:00
kdebug.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
kmap_types.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
linkage.h score: update inconsistent declare after .c was changed 2009-08-30 12:30:16 +08:00
local.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
local64.h arch: Implement local64_t 2010-06-09 11:12:36 +02:00
mman.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
mmu.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
mmu_context.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
module.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
msgbuf.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
mutex.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
page.h score: fixed pfn_valid define. 2009-12-17 18:28:31 +08:00
param.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
pci.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
percpu.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
pgalloc.h score: update inconsistent declare after .c was changed 2009-08-30 12:30:16 +08:00
pgtable-bits.h score: update files according to review comments 2009-06-19 11:40:13 +02: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 score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
posix_types.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
processor.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
ptrace.h ptrace: move user_enable_single_step & co prototypes to linux/ptrace.h 2010-03-12 15:52:38 -08:00
resource.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
scatterlist.h remove needless ISA_DMA_THRESHOLD 2010-08-07 18:15:50 +02:00
scoreregs.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
sections.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
segment.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
sembuf.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
setup.h score: add MEMORY_START and MEMORY_SIZE define, to make the code clear 2009-08-30 12:31:58 +08:00
shmbuf.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
shmparam.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
sigcontext.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
siginfo.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
signal.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
socket.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
sockios.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
stat.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
statfs.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
string.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
swab.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
syscalls.h score: add prototypes for wrapped syscalls 2009-06-19 14:10:46 +02:00
system.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
termbits.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
termios.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
thread_info.h add descriptive comment for TIF_MEMDIE task flag declaration. 2010-05-14 11:13:27 +02:00
timex.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
tlb.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
tlbflush.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
topology.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
types.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
uaccess.h score: update inconsistent declare after .c was changed 2009-08-30 12:30:16 +08:00
ucontext.h score: add missing #includes 2009-06-27 15:09:46 +02:00
unaligned.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
unistd.h score: add old syscall support 2009-08-30 12:33:30 +08:00
user.h score: update inconsistent declare after .c was changed 2009-08-30 12:30:16 +08:00