Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel

Browse source

Conflicts:
	arch/arm/Makefile

...

This commit is contained in:

Russell King 2009-05-29 20:03:43 +01:00 • committed by Russell King

parent b0958aed1e cd07ecc828

commit 949abd84cd

100 changed files with 9735 additions and 1402 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

77

MAINTAINERS

View file

1

arch/arm/Makefile

View file

1528

arch/arm/configs/omap3_evm_defconfig

View file

806

arch/arm/configs/omap_4430sdp_defconfig

View file

1211

arch/arm/configs/omap_zoom2_defconfig

View file

2

arch/arm/configs/rx51_defconfig

View file

1

arch/arm/mach-omap1/Kconfig

View file

4

arch/arm/mach-omap1/Makefile

View file

13

arch/arm/mach-omap1/board-nokia770.c

View file

2

arch/arm/mach-omap1/clock.c

View file

11

arch/arm/mach-omap1/pm.c

View file

85

arch/arm/plat-omap/include/mach/pm.h → arch/arm/mach-omap1/pm.h

View file

3

arch/arm/mach-omap1/serial.c

View file

2

arch/arm/mach-omap1/sleep.S

View file

14

arch/arm/mach-omap2/Kconfig

View file

30

arch/arm/mach-omap2/Makefile

View file

124

arch/arm/mach-omap2/board-2430sdp.c

View file

87

arch/arm/mach-omap2/board-3430sdp.c

View file

94

arch/arm/mach-omap2/board-4430sdp.c

View file

219

arch/arm/mach-omap2/board-ldp.c

View file

108

arch/arm/mach-omap2/board-omap3beagle.c

View file

329

arch/arm/mach-omap2/board-omap3evm.c

View file

197

arch/arm/mach-omap2/board-omap3pandora.c

View file

79

arch/arm/mach-omap2/board-overo.c

View file

232

arch/arm/mach-omap2/board-rx51-peripherals.c

View file

160

arch/arm/mach-omap2/board-zoom-debugboard.c

View file

110

arch/arm/mach-omap2/board-zoom2.c

View file

18

arch/arm/mach-omap2/clock.c

View file

23

arch/arm/mach-omap2/clock24xx.c

View file

11

arch/arm/mach-omap2/clock24xx.h

View file

23

arch/arm/mach-omap2/clock34xx.c

View file

35

arch/arm/mach-omap2/clock34xx.h

View file

2

arch/arm/mach-omap2/clockdomains.h

View file

14

arch/arm/mach-omap2/cm-regbits-34xx.h

View file

6

arch/arm/mach-omap2/cm.h

View file

330

arch/arm/mach-omap2/gpmc-onenand.c

View file

189

arch/arm/mach-omap2/gpmc-smc91x.c

View file

6

arch/arm/mach-omap2/gpmc.c

View file

8

arch/arm/mach-omap2/id.c

View file

52

arch/arm/mach-omap2/io.c

View file

18

arch/arm/mach-omap2/irq.c

View file

280

arch/arm/mach-omap2/mmc-twl4030.c

View file

3

arch/arm/mach-omap2/mmc-twl4030.h

View file

152

arch/arm/mach-omap2/pm-debug.c

View file

111

arch/arm/mach-omap2/pm.c

View file

38

arch/arm/mach-omap2/pm.h

View file

549

arch/arm/mach-omap2/pm24xx.c

View file

710

arch/arm/mach-omap2/pm34xx.c

View file

2

arch/arm/mach-omap2/prcm-common.h

View file

187

arch/arm/mach-omap2/prm.h

View file

55

arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h

View file

54

arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h

View file

24

arch/arm/mach-omap2/sdrc.c

View file

5

arch/arm/mach-omap2/sdrc2xxx.c

View file

469

arch/arm/mach-omap2/serial.c

View file

1

arch/arm/mach-omap2/sleep24xx.S

View file

436

arch/arm/mach-omap2/sleep34xx.S

View file

10

arch/arm/mach-omap2/sram242x.S

View file

10

arch/arm/mach-omap2/sram243x.S

View file

129

arch/arm/mach-omap2/sram34xx.S

View file

9

arch/arm/mach-omap2/timer-gp.c

View file

21

arch/arm/mach-omap2/usb-musb.c

View file

13

arch/arm/plat-omap/Kconfig

View file

37

arch/arm/plat-omap/clock.c

View file

114

arch/arm/plat-omap/common.c

View file

2

arch/arm/plat-omap/devices.c

View file

102

arch/arm/plat-omap/dma.c

View file

73

arch/arm/plat-omap/dmtimer.c

View file

134

arch/arm/plat-omap/gpio.c

View file

2

arch/arm/plat-omap/i2c.c

View file

10

arch/arm/plat-omap/include/mach/clock.h

View file

3

arch/arm/plat-omap/include/mach/common.h

View file

20

arch/arm/plat-omap/include/mach/control.h

View file

21

arch/arm/plat-omap/include/mach/cpu.h

View file

2

arch/arm/plat-omap/include/mach/debug-macro.S

View file

4

arch/arm/plat-omap/include/mach/dma.h

View file

55

arch/arm/plat-omap/include/mach/entry-macro.S

View file

42

arch/arm/plat-omap/include/mach/gpmc-smc91x.h

View file

1

arch/arm/plat-omap/include/mach/hardware.h

View file

4

arch/arm/plat-omap/include/mach/hwa742.h

View file

37

arch/arm/plat-omap/include/mach/io.h

View file

90

arch/arm/plat-omap/include/mach/irqs.h

View file

4

arch/arm/plat-omap/include/mach/keypad.h

View file

3

arch/arm/plat-omap/include/mach/memory.h

View file

18

arch/arm/plat-omap/include/mach/omap24xx.h

View file

13

arch/arm/plat-omap/include/mach/omap34xx.h

View file

46

arch/arm/plat-omap/include/mach/omap44xx.h

View file

22

arch/arm/plat-omap/include/mach/onenand.h

View file

25

arch/arm/plat-omap/include/mach/serial.h

View file

6

arch/arm/plat-omap/include/mach/sram.h

View file

6

arch/arm/plat-omap/include/mach/usb.h

View file

2

arch/arm/plat-omap/include/mach/vmalloc.h

View file

29

arch/arm/plat-omap/io.c

View file

30

arch/arm/plat-omap/mcbsp.c

View file

3

arch/arm/plat-omap/mux.c

View file

66

arch/arm/plat-omap/sram.c

View file

6

drivers/mmc/host/omap_hsmmc.c

View file

1

drivers/mtd/onenand/omap2.c

View file

26

drivers/video/omap/hwa742.c

View file