Merge branch 'dt/gic' into next/dt

Browse source

Conflicts:
	arch/arm/include/asm/localtimer.h
	arch/arm/mach-msm/board-msm8x60.c
	arch/arm/mach-omap2/board-generic.c

...

This commit is contained in:

Arnd Bergmann 2011-10-31 14:08:10 +01:00

parent 86c1e5a74a f37a53cc5d

commit 08cab72f91

559 changed files with 8641 additions and 3064 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

107

drivers/of/irq.c

View file

6

drivers/usb/musb/musb_debugfs.c

View file