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
..
iwl3945-base.c	iwlegacy: remove firmware event log	2011-06-10 14:57:50 -04:00
iwl4965-base.c	iwlegacy: Add missing comma between constant string array	2011-07-13 14:49:34 -04:00
iwl-3945-debugfs.c
iwl-3945-debugfs.h
iwl-3945-fh.h
iwl-3945-hw.h
iwl-3945-led.c
iwl-3945-led.h
iwl-3945-rs.c
iwl-3945.c	iwlegacy: remove firmware event log	2011-06-10 14:57:50 -04:00
iwl-3945.h
iwl-4965-calib.c
iwl-4965-calib.h
iwl-4965-debugfs.c
iwl-4965-debugfs.h
iwl-4965-eeprom.c
iwl-4965-hw.h
iwl-4965-led.c
iwl-4965-led.h
iwl-4965-lib.c	iwlegacy: remove reset rf infrastructure	2011-06-10 14:57:49 -04:00
iwl-4965-rs.c	iwlegacy: add missing null check	2011-06-03 15:16:35 -04:00
iwl-4965-rx.c	iwlegacy: remove recover from statistics	2011-06-10 14:57:49 -04:00
iwl-4965-sta.c
iwl-4965-tx.c	mac80211: fix TKIP races, make API easier to use	2011-07-08 11:11:19 -04:00
iwl-4965-ucode.c
iwl-4965.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-06-20 22:29:08 -07:00
iwl-4965.h
iwl-commands.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
iwl-core.c	iwlegacy: remove firmware event log	2011-06-10 14:57:50 -04:00
iwl-core.h	iwlegacy: remove unnecessary read of PCI_CAP_ID_EXP	2011-06-29 14:53:25 -04:00
iwl-csr.h
iwl-debug.h
iwl-debugfs.c	iwlegacy: remove firmware event log	2011-06-10 14:57:50 -04:00
iwl-dev.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2011-06-24 15:25:51 -04:00
iwl-devtrace.c	iwlegacy: remove firmware event log	2011-06-10 14:57:50 -04:00
iwl-devtrace.h	iwlegacy: remove firmware event log	2011-06-10 14:57:50 -04:00
iwl-eeprom.c	iwlegacy: remove unreachable code	2011-06-03 15:16:32 -04:00
iwl-eeprom.h
iwl-fh.h
iwl-hcmd.c
iwl-helpers.h	iwlegacy: fix stop/wake queue hacks	2011-06-20 15:16:31 -04:00
iwl-io.h
iwl-led.c
iwl-led.h
iwl-legacy-rs.h
iwl-power.c
iwl-power.h
iwl-prph.h
iwl-rx.c	iwlegacy: remove recover from statistics	2011-06-10 14:57:49 -04:00
iwl-scan.c	iwlegacy: remove reset rf infrastructure	2011-06-10 14:57:49 -04:00
iwl-spectrum.h
iwl-sta.c
iwl-sta.h
iwl-tx.c
Kconfig
Makefile