linux/arch/s390
Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
2011-07-25 13:56:39 -07:00
..
appldata [S390] mm: add ZONE_DMA to 31-bit config again 2011-05-26 09:48:25 +02:00
boot [S390] fix s390 assembler code alignments 2011-07-24 10:48:21 +02:00
crypto crypto: s390 - support hardware accelerated SHA-224 2011-07-04 20:06:01 +08:00
hypfs treewide: remove extra semicolons 2011-04-10 17:01:05 +02:00
include/asm [S390] kvm: make sigp emerg smp capable 2011-07-24 10:48:22 +02:00
kernel Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 2011-07-24 09:55:45 -07:00
kvm [S390] kvm: make sigp emerg smp capable 2011-07-24 10:48:22 +02:00
lib [S390] fix s390 assembler code alignments 2011-07-24 10:48:21 +02:00
math-emu s390: change to new flag variable 2011-03-17 14:02:57 +01:00
mm [S390] kvm guest address space mapping 2011-07-24 10:48:21 +02:00
oprofile Merge branch 'master' into for-next 2011-07-11 14:15:55 +02:00
defconfig [S390] Update default configuration 2011-01-12 09:55:24 +01:00
Kbuild [S390] standardize Kbuild rules 2010-10-25 16:10:14 +02:00
Kconfig [S390] kvm-s390: fix kconfig dependencies 2011-06-22 16:24:19 +02:00
Kconfig.debug [S390] Write protect module text and RO data 2011-03-15 17:08:23 +01:00
Makefile [S390] remove redundant stack check option 2011-03-15 17:08:22 +01:00