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

Browse source

Conflicts:

	drivers/macintosh/adbhid.c

...

This commit is contained in:

Dmitry Torokhov 2007-10-12 21:27:47 -04:00

parent b11d2127c4 2b9e0aae1d

commit b981d8b3f5

8522 changed files with 721900 additions and 424181 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

63

include/acpi/acmacros.h

View file

4

include/acpi/acoutput.h

View file

25

include/acpi/acpi_bus.h

View file

25

include/acpi/acpi_drivers.h

View file

1

include/acpi/acpi_numa.h

View file

2

include/acpi/acpixf.h

View file

2

include/acpi/acstruct.h

View file

6

include/acpi/actypes.h

View file

4

include/acpi/acutils.h

View file

2

include/acpi/platform/acenv.h

View file

3

include/acpi/platform/aclinux.h

View file

51

include/acpi/processor.h

View file

2

include/asm-alpha/a.out.h

View file

2

include/asm-alpha/bitops.h

View file

1

include/asm-alpha/fcntl.h

View file

4

include/asm-alpha/irq.h

View file

10

include/asm-alpha/system.h

View file

24

include/asm-alpha/thread_info.h

View file

1

include/asm-arm/a.out.h

View file

3

include/asm-arm/arch-at91/at91_mci.h

View file

3

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

View file

5

include/asm-arm/arch-imx/mmc.h

View file

43

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

View file

34

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

View file

3

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

View file

2

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

View file

142

include/asm-arm/arch-mxc/board-mx31ads.h

View file

20

include/asm-arm/arch-mxc/common.h

View file

21

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

View file

39

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

View file

52

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

View file

33

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

View file

38

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

View file

36

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

View file

335

include/asm-arm/arch-mxc/mx31.h

View file

149

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

View file

50

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

View file

25

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

View file

78

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

View file

36

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

View file

28

include/asm-arm/arch-ns9xxx/regs-bbu.h

View file

6

include/asm-arm/arch-ns9xxx/regs-mem.h

View file

2

include/asm-arm/arch-ns9xxx/regs-sys.h

View file

1

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

View file

2

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

View file

16

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

View file

6

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

View file

66

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

View file

23

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

View file

84

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

View file

85

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

View file

13

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

View file

2

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

View file

2

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

View file

147

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

View file

27

include/asm-arm/arch-sa1100/jornada720.h

View file

7

include/asm-arm/cacheflush.h

View file

3

include/asm-arm/elf.h

View file

18

include/asm-arm/floppy.h

View file

33

include/asm-arm/hardware/iop3xx.h

View file

4

include/asm-arm/pgtable-nommu.h

View file

75

include/asm-arm/plat-s3c/debug-macro.S

View file

0

include/asm-arm/arch-s3c2410/iic.h → include/asm-arm/plat-s3c/iic.h

View file

40

include/asm-arm/plat-s3c/map.h

View file

0

include/asm-arm/arch-s3c2410/nand.h → include/asm-arm/plat-s3c/nand.h

View file

0

include/asm-arm/arch-s3c2410/regs-ac97.h → include/asm-arm/plat-s3c/regs-ac97.h

View file

0

include/asm-arm/arch-s3c2410/regs-adc.h → include/asm-arm/plat-s3c/regs-adc.h

View file

0

include/asm-arm/arch-s3c2410/regs-iic.h → include/asm-arm/plat-s3c/regs-iic.h

View file

0

include/asm-arm/arch-s3c2410/regs-nand.h → include/asm-arm/plat-s3c/regs-nand.h

View file

0

include/asm-arm/arch-s3c2410/regs-rtc.h → include/asm-arm/plat-s3c/regs-rtc.h

View file

8

include/asm-arm/arch-s3c2410/regs-serial.h → include/asm-arm/plat-s3c/regs-serial.h

View file

16

include/asm-arm/arch-s3c2410/regs-timer.h → include/asm-arm/plat-s3c/regs-timer.h

View file

8

include/asm-arm/arch-s3c2410/regs-watchdog.h → include/asm-arm/plat-s3c/regs-watchdog.h

View file

155

include/asm-arm/plat-s3c/uncompress.h

View file

0

include/asm-arm/arch-s3c2410/regs-iis.h → include/asm-arm/plat-s3c24xx/regs-iis.h

View file

0

include/asm-arm/arch-s3c2410/regs-spi.h → include/asm-arm/plat-s3c24xx/regs-spi.h

View file

0

include/asm-arm/arch-s3c2410/regs-udc.h → include/asm-arm/plat-s3c24xx/regs-udc.h

View file

0

include/asm-arm/arch-s3c2410/udc.h → include/asm-arm/plat-s3c24xx/udc.h

View file

10

include/asm-arm/system.h

View file

8

include/asm-arm/thread_info.h

View file

22

include/asm-arm/unaligned.h

View file

1

include/asm-arm/unistd.h

View file

4

include/asm-arm/vfp.h

View file

38

include/asm-arm26/a.out.h

View file

106

include/asm-arm26/assembler.h

View file

123

include/asm-arm26/atomic.h

View file

4

include/asm-arm26/auxvec.h

View file

207

include/asm-arm26/bitops.h

View file

19

include/asm-arm26/bug.h

View file

15

include/asm-arm26/bugs.h

View file

24

include/asm-arm26/byteorder.h

View file

12

include/asm-arm26/cache.h

View file

53

include/asm-arm26/cacheflush.h

View file

151

include/asm-arm26/checksum.h

View file

28

include/asm-arm26/constants.h

View file

6

include/asm-arm26/cputime.h

View file

15

include/asm-arm26/current.h

View file

34

include/asm-arm26/delay.h

View file

7

include/asm-arm26/device.h

View file

183

include/asm-arm26/dma.h

View file

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