Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse source

Manually resolve conflict in include/mtd/Kbuild

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

...

This commit is contained in:

David Woodhouse 2006-10-01 17:55:53 +01:00

parent 28b79ff966 82965addad

commit 8a84fc15ae

4974 changed files with 343194 additions and 167404 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

11

include/Kbuild

View file

10

include/asm-alpha/Kbuild

View file

1

include/asm-alpha/mmzone.h

View file

9

include/asm-alpha/pgtable.h

View file

4

include/asm-alpha/spinlock.h

View file

118

include/asm-arm/arch-at91rm9200/at91rm9200.h

View file

3

include/asm-arm/arch-at91rm9200/at91rm9200_sys.h

View file

57

include/asm-arm/arch-at91rm9200/at91rm9200_twi.h

View file

18

include/asm-arm/arch-at91rm9200/gpio.h

View file

28

include/asm-arm/arch-at91rm9200/hardware.h

View file

2

include/asm-arm/arch-at91rm9200/irqs.h

View file

2

include/asm-arm/arch-clps711x/time.h

View file

1

include/asm-arm/arch-ep93xx/ep93xx-regs.h

View file

6

include/asm-arm/arch-ep93xx/platform.h

View file

20

include/asm-arm/arch-iop32x/debug-macro.S

View file

4

include/asm-arm/arch-iop3xx/dma.h → include/asm-arm/arch-iop32x/dma.h

View file

21

include/asm-arm/arch-iop32x/entry-macro.S

View file

13

include/asm-arm/arch-iop32x/glantank.h

View file

44

include/asm-arm/arch-iop32x/hardware.h

View file

11

include/asm-arm/arch-iop3xx/io.h → include/asm-arm/arch-iop32x/io.h

View file

28

include/asm-arm/arch-iop32x/iop32x.h

View file

15

include/asm-arm/arch-iop3xx/iq31244.h → include/asm-arm/arch-iop32x/iq31244.h

View file

15

include/asm-arm/arch-iop3xx/iq80321.h → include/asm-arm/arch-iop32x/iq80321.h

View file

50

include/asm-arm/arch-iop32x/irqs.h

View file

26

include/asm-arm/arch-iop32x/memory.h

View file

19

include/asm-arm/arch-iop32x/n2100.h

View file

33

include/asm-arm/arch-iop32x/system.h

View file

9

include/asm-arm/arch-iop32x/timex.h

View file

39

include/asm-arm/arch-iop32x/uncompress.h

View file

5

include/asm-arm/arch-iop32x/vmalloc.h

View file

24

include/asm-arm/arch-iop33x/debug-macro.S

View file

9

include/asm-arm/arch-iop33x/dma.h

View file

22

include/asm-arm/arch-iop33x/entry-macro.S

View file

46

include/asm-arm/arch-iop33x/hardware.h

View file

21

include/asm-arm/arch-iop33x/io.h

View file

33

include/asm-arm/arch-iop33x/iop33x.h

View file

15

include/asm-arm/arch-iop3xx/iq80331.h → include/asm-arm/arch-iop33x/iq80331.h

View file

15

include/asm-arm/arch-iop3xx/iq80332.h → include/asm-arm/arch-iop33x/iq80332.h

View file

60

include/asm-arm/arch-iop33x/irqs.h

View file

26

include/asm-arm/arch-iop33x/memory.h

View file

22

include/asm-arm/arch-iop33x/system.h

View file

9

include/asm-arm/arch-iop33x/timex.h

View file

37

include/asm-arm/arch-iop33x/uncompress.h

View file

5

include/asm-arm/arch-iop33x/vmalloc.h

View file

35

include/asm-arm/arch-iop3xx/debug-macro.S

View file

57

include/asm-arm/arch-iop3xx/entry-macro.S

View file

57

include/asm-arm/arch-iop3xx/hardware.h

View file

100

include/asm-arm/arch-iop3xx/iop321-irqs.h

View file

345

include/asm-arm/arch-iop3xx/iop321.h

View file

132

include/asm-arm/arch-iop3xx/iop331-irqs.h

View file

363

include/asm-arm/arch-iop3xx/iop331.h

View file

21

include/asm-arm/arch-iop3xx/irqs.h

View file

38

include/asm-arm/arch-iop3xx/memory.h

View file

35

include/asm-arm/arch-iop3xx/system.h

View file

20

include/asm-arm/arch-iop3xx/timex.h

View file

48

include/asm-arm/arch-iop3xx/uncompress.h

View file

16

include/asm-arm/arch-iop3xx/vmalloc.h

View file

5

include/asm-arm/arch-ixp4xx/platform.h

View file

8

include/asm-arm/arch-l7200/io.h

View file

2

include/asm-arm/arch-l7200/time.h

View file

11

include/asm-arm/arch-omap/board-ams-delta.h

View file

1

include/asm-arm/arch-omap/clock.h

View file

16

include/asm-arm/arch-omap/dma.h

View file

2

include/asm-arm/arch-omap/dmtimer.h

View file

4

include/asm-arm/arch-omap/gpmc.h

View file

2

include/asm-arm/arch-omap/irqs.h

View file

3

include/asm-arm/arch-omap/keypad.h

View file

25

include/asm-arm/arch-omap/mux.h

View file

8

include/asm-arm/arch-pxa/udc.h

View file

66

include/asm-arm/arch-s3c2410/dma.h

View file

5

include/asm-arm/arch-s3c2410/map.h

View file

18

include/asm-arm/arch-s3c2410/osiris-map.h

View file

23

include/asm-arm/arch-s3c2410/regs-ac97.h

View file

30

include/asm-arm/arch-s3c2410/regs-lcd.h

View file

16

include/asm-arm/atomic.h

View file

24

include/asm-arm/bitops.h

View file

22

include/asm-arm/cacheflush.h

View file

18

include/asm-arm/elf.h

View file

16

include/asm-arm/flat.h

View file

301

include/asm-arm/hardware/iop3xx.h

View file

33

include/asm-arm/hardware/locomo.h

View file

1

include/asm-arm/hardware/sharpsl_pm.h

View file

4

include/asm-arm/io.h

View file

132

include/asm-arm/irqflags.h

View file

10

include/asm-arm/mach/pci.h

View file

2

include/asm-arm/mach/time.h

View file

7

include/asm-arm/page.h

View file

15

include/asm-arm/pgtable.h

View file

40

include/asm-arm/proc-fns.h

View file

12

include/asm-arm/setup.h

View file

4

include/asm-arm/spinlock.h

View file

137

include/asm-arm/system.h

View file

4

include/asm-arm/timeofday.h

View file

76

include/asm-arm/tlbflush.h

View file

62

include/asm-arm/unaligned.h

View file

3

include/asm-arm/unistd.h

View file

8

include/asm-arm26/pgtable.h

View file

3

include/asm-arm26/unistd.h

View file

2

include/asm-arm26/Kbuild → include/asm-avr32/Kbuild

View file

26

include/asm-avr32/a.out.h

View file

Some files were not shown because too many files have changed in this diff Show more