Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ... Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c		2010-03-08 16:55:37 +01:00
..
include/mach	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-03-01 10:38:09 -08:00
adssphere.c	[ARM] 5592/1: ep93xx: cleanup platform header includes	2009-07-09 16:13:44 +01:00
clock.c	Merge branches 'clks' and 'pnx' into devel	2010-02-25 22:10:38 +00:00
core.c	ARM: 5955/1: ep93xx: move timer defines into core.c and document	2010-02-24 21:08:36 +00:00
dma-m2p.c	ARM: 5876/1: ep93xx: use pr_fmt in dma-m2p.c	2010-01-12 12:38:32 +00:00
edb93xx.c	ARM: 5878/1: ep93xx: register the pwm devices on the edb93xx dev boards	2010-01-12 12:38:33 +00:00
gesbc9312.c	[ARM] 5592/1: ep93xx: cleanup platform header includes	2009-07-09 16:13:44 +01:00
gpio.c	ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c	2010-02-24 21:08:36 +00:00
Kconfig	ARM: 5937/1: Add support for EP9315 based Snapper CL15 board	2010-02-15 19:40:50 +00:00
Makefile	ARM: 5937/1: Add support for EP9315 based Snapper CL15 board	2010-02-15 19:40:50 +00:00
Makefile.boot	ARM: 5744/1: ep93xx: add remaining phys offset selections	2009-10-07 13:11:56 +01:00
micro9.c	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
simone.c	ARM: 5892/1: ep93xx: Add support for Simplemachines Sim.One board	2010-01-25 21:14:29 +00:00
snappercl15.c	ARM: 5937/1: Add support for EP9315 based Snapper CL15 board	2010-02-15 19:40:50 +00:00
ts72xx.c	Merge branch 'master' into devel	2009-09-12 12:04:37 +01:00