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
..
boot
Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci', 'suspend' and 'vfp' into for-next
2011-07-22 23:08:48 +01:00
common
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-07-25 13:56:39 -07:00
configs
Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:43:28 -07:00
include /asm
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
kernel
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-07-24 10:20:54 -07:00
lib
mach-at91
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-07-25 13:56:39 -07:00
mach-bcmring
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
2011-07-25 12:53:15 -07:00
mach-clps711x
mach-cns3xxx
mach-davinci
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
mach-dove
mach-ebsa110
mach-ep93xx
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-07-25 13:56:39 -07:00
mach-exynos4
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
mach-footbridge
Merge branch 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-07-22 16:51:56 -07:00
mach-gemini
mach-h720x
Merge branch 'devel-stable' into for-next
2011-07-22 23:09:07 +01:00
mach-imx
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
Merge branch 'devel-stable' into for-next
2011-07-22 23:09:07 +01:00
mach-ixp23xx
mach-ixp2000
mach-kirkwood
mach-ks8695
mach-l7200/include /mach
mach-lpc32xx
Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 11:53:35 -07:00
mach-mmp
mmc: sdhci-pxa: move platform data to include/linux/platform_data
2011-07-20 17:20:52 -04:00
mach-msm
Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 11:53:35 -07:00
mach-mv78xx0
mach-mx5
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
mach-mxs
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
mach-netx
mach-nomadik
mach-nuc93x
mach-omap1
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
mach-omap2
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
mach-orion5x
ARM: orion5x: fixup 5181 MPP mask check
2011-07-18 16:17:41 -04:00
mach-pnx4008
mach-pxa
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-07-25 13:56:39 -07:00
mach-realview
Merge branch 'devel-stable' into for-next
2011-07-22 23:09:07 +01:00
mach-rpc
mach-s3c64xx
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
mach-s3c2400/include /mach
mach-s3c2410
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-07-25 13:56:39 -07:00
mach-s3c2412
Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:43:28 -07:00
mach-s3c2416
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
mach-s3c2440
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
mach-s3c2443
ARM: S3C24XX: Add clkdev support
2011-07-20 19:11:29 +09:00
mach-s5p64x0
ARM: S5P64X0: Add PWM backlight support on SMDK6450
2011-07-21 02:10:46 +09:00
mach-s5pc100
ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100
2011-07-21 02:11:30 +09:00
mach-s5pv210
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
mach-sa1100
Merge branch 'devel-stable' into for-next
2011-07-22 23:09:07 +01:00
mach-shark
Merge branch 'devel-stable' into for-next
2011-07-22 23:09:07 +01:00
mach-shmobile
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-07-25 13:56:39 -07:00
mach-spear3xx
mach-spear6xx
mach-tcc8k
mach-tegra
Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 11:53:35 -07:00
mach-u300
mach-ux500
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-07-25 13:56:39 -07:00
mach-versatile
mach-vexpress
Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci', 'suspend' and 'vfp' into for-next
2011-07-22 23:08:48 +01:00
mach-vt8500
mach-w90x900
mm
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-07-24 10:20:54 -07:00
nwfpe
oprofile
plat-iop
plat-mxc
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
plat-nomadik
plat-omap
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
plat-orion
plat-pxa
mmc: sdhci-pxa: move platform data to include/linux/platform_data
2011-07-20 17:20:52 -04:00
plat-s3c24xx
Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:43:28 -07:00
plat-s5p
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-07-25 13:56:39 -07:00
plat-samsung
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-07-25 13:56:39 -07:00
plat-spear
switch assorted clock drivers to debugfs_remove_recursive()
2011-07-20 20:47:51 -04:00
plat-tcc
plat-versatile
tools
vfp
Merge branch 'devel-stable' into for-next
2011-07-22 23:09:07 +01:00
Kconfig
Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:43:28 -07:00
Kconfig-nommu
Kconfig.debug
Makefile