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
..
2011-07-23 09:32:52 -05:00
2011-06-01 21:15:38 -07:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-05-05 11:10:14 -07:00
2010-12-31 10:47:46 -08:00
2011-07-05 23:42:17 -07:00
2010-06-03 03:21:52 -07:00
2010-10-27 11:37:32 -07:00
2011-03-31 11:26:23 -03:00
2011-07-17 23:11:35 -07:00
2010-10-25 13:09:45 -07:00
2010-10-27 11:37:32 -07:00
2011-03-31 11:26:23 -03:00
2011-07-20 15:04:35 -04:00
2010-06-03 03:21:52 -07:00
2011-06-22 16:09:45 -04:00
2011-07-05 15:26:57 -04:00
2011-05-17 14:16:58 -04:00
2011-01-24 15:32:47 -08:00
2010-11-24 11:16:43 -08:00
2011-06-11 16:23:59 -07:00
2011-03-01 12:35:03 -08:00
2011-03-01 12:35:03 -08:00
2011-03-31 11:26:23 -03:00
2010-11-28 11:12:20 -08:00