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
2009-08-03 09:05:00 +01:00
2009-08-17 18:32:09 -07:00
2009-12-12 13:08:14 +01:00
2008-12-09 00:50:13 -08:00
2008-08-31 20:59:37 -07:00
2010-05-17 07:57:27 -07:00
2010-08-17 21:44:13 -07:00
2010-08-18 22:53:26 -07:00
2011-03-23 19:46:22 -07:00
2011-03-23 19:46:22 -07:00
2009-06-11 21:02:14 +02:00
2009-11-27 17:33:43 -08:00
2008-09-02 00:49:38 -07:00
2009-01-14 19:56:50 -08:00
2010-06-29 00:38:02 -07:00
2009-11-26 09:16:19 +01:00
2009-11-26 09:16:19 +01:00
2010-09-14 16:08:45 -07:00
2011-05-16 13:07:43 -07:00
2010-04-12 22:37:07 -07:00
2010-07-24 09:57:52 -06:00
2010-08-11 08:59:21 -07:00
2008-08-29 02:15:23 -07:00
2008-08-29 23:10:21 -07:00
2009-12-16 07:20:12 -08:00
2011-07-21 14:10:00 +02:00
2011-03-17 13:08:27 -03:00
2010-08-16 12:26:09 -07:00
2010-02-05 12:22:42 +01:00
2011-03-16 09:54:02 -04:00
2008-08-31 20:56:15 -07:00
2011-06-07 16:06:34 -07:00
2011-06-07 16:06:34 -07:00
2009-06-16 04:56:53 -07:00
2011-03-11 12:23:31 +01:00
2008-08-24 20:33:56 -07:00
2009-10-01 13:45:13 -07:00
2010-10-26 16:52:08 -07:00
2011-03-31 11:26:23 -03:00
2010-10-27 18:03:08 -07:00
2010-10-27 18:03:08 -07:00
2008-08-29 02:15:23 -07:00
2011-05-12 13:44:29 -07:00
2011-02-17 14:16:30 -08:00
2008-08-29 02:15:21 -07:00
2008-09-10 23:07:41 -07:00
2009-01-04 15:44:52 -08:00
2011-04-19 22:11:40 -07:00
2011-03-18 15:03:16 -07:00
2011-07-06 08:00:29 -07:00
2011-07-06 08:00:29 -07:00
2009-01-02 21:31:13 -08:00
2011-04-04 12:48:08 -04:00
2010-10-08 13:04:00 -06:00
2008-11-01 21:44:01 -07:00
2009-01-30 00:03:53 -08:00
2009-06-16 19:47:51 -07:00
2011-03-16 18:19:04 -07:00
2011-06-02 14:32:37 -07:00
2011-06-02 14:32:38 -07:00
2010-06-09 11:12:36 +02:00
2009-08-17 18:32:10 -07:00
2008-08-29 14:16:48 -07:00
2009-06-16 04:56:21 -07:00
2010-08-05 12:56:07 +10:00
2008-08-24 22:08:34 -07:00
2009-09-22 07:17:41 -07:00
2011-03-16 18:19:08 -07:00
2009-03-16 14:40:39 +10:30
2011-06-27 14:13:09 -07:00
2008-12-26 15:35:41 -08:00
2009-09-10 06:28:20 -07:00
2011-03-31 11:26:23 -03:00
2008-09-08 15:40:45 -07:00
2010-11-30 14:33:29 -08:00
2011-01-03 12:15:12 -08:00
2010-12-12 14:57:53 -08:00
2010-01-14 03:14:53 -08:00
2009-06-11 21:02:17 +02:00
2010-01-12 02:46:16 -08:00
2011-02-28 01:36:39 -07:00
2011-07-22 14:54:02 -07:00
2011-06-08 09:08:43 +10:00
2010-03-12 15:52:42 -08:00
2011-06-02 14:32:37 -07:00
2011-03-31 11:26:23 -03:00
2009-06-16 04:56:23 -07:00
2010-11-26 15:14:56 +01:00
2010-03-03 08:08:49 -08:00
2009-07-27 12:10:38 -07:00
2011-05-25 08:39:13 -07:00
2011-04-21 15:48:39 -07:00
2011-05-25 08:39:13 -07:00
2009-08-17 18:32:10 -07:00
2009-03-18 23:51:57 -07:00
2009-01-02 18:35:29 -08:00
2009-01-02 19:32:59 -08:00
2008-11-02 00:15:38 -07:00
2010-10-10 21:53:30 -06:00
2011-07-21 17:29:49 -05:00
2011-01-27 12:30:39 +01:00
2010-08-07 18:15:50 +02:00
2009-03-02 15:41:30 -08:00
2008-12-27 00:35:12 -08:00
2008-10-13 09:51:40 -07:00
2011-04-21 16:44:44 -07:00
2009-01-02 19:34:46 -08:00
2009-01-02 21:10:04 -08:00
2009-06-11 21:01:52 +02:00
2011-05-16 13:38:07 -07:00
2011-04-21 15:45:45 -07:00
2009-10-12 13:26:31 -07:00
2011-05-22 21:41:35 -07:00
2009-12-14 23:55:32 +01:00
2009-12-14 23:55:32 +01:00
2008-12-07 00:04:30 -08:00
2008-08-31 01:40:12 -07:00
2010-03-27 08:36:18 -07:00
2008-09-06 19:30:17 +01:00
2009-12-10 23:32:10 -08:00
2009-12-10 23:32:10 -08:00
2009-01-06 18:10:27 -08:00
2010-02-17 13:07:21 +01:00
2011-06-07 16:06:34 -07:00
2011-06-07 16:06:34 -07:00
2010-08-10 13:47:39 -07:00
2011-03-22 17:44:01 -07:00
2011-03-22 17:44:01 -07:00
2008-09-19 21:18:03 -07:00
2009-01-06 13:19:28 -08:00
2010-01-15 01:34:28 -08:00
2011-05-25 08:39:13 -07:00
2011-05-25 08:39:13 -07:00
2011-04-12 08:46:41 +02:00
2009-06-16 04:56:11 -07:00
2009-01-02 21:33:05 -08:00
2008-12-04 09:16:47 -08:00
2008-12-04 09:17:03 -08:00
2011-03-23 19:47:18 -07:00
2010-08-09 00:45:46 -07:00
2010-08-09 00:45:46 -07:00
2011-05-28 10:48:39 -07:00
2008-08-31 20:59:37 -07:00
2009-09-23 07:39:29 -07:00
2008-09-11 23:46:40 -07:00
2011-05-16 13:03:28 -07:00
d3ec4844d4