Merge commit 'v2.6.27-rc5' into tip/oprofile

Browse source

Conflicts:
	arch/x86/oprofile/nmi_int.c

...

This commit is contained in:

Robert Richter 2008-09-24 11:25:31 +02:00

parent 4c168eaf7e 24342c34a0

commit f78e80209c

1143 changed files with 89780 additions and 67769 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

6

Documentation/filesystems/ext4.txt

View file

67

Documentation/ja_JP/HOWTO

View file

111

Documentation/ja_JP/SubmitChecklist

View file

5

Documentation/kernel-parameters.txt

View file

8

Documentation/lguest/lguest.c

View file

5

Documentation/rfkill.txt

View file

23

Documentation/scsi/ChangeLog.megaraid_sas

View file

93

MAINTAINERS

View file

2

Makefile

View file

19

arch/alpha/kernel/osf_sys.c

View file

5

arch/arm/Kconfig

View file

1314

arch/arm/configs/ams_delta_defconfig

View file

1421

arch/arm/configs/n770_defconfig

View file

1304

arch/arm/configs/omap_2430sdp_defconfig

View file

962

arch/arm/configs/omap_apollon_2420_defconfig

View file

1172

arch/arm/configs/omap_generic_1510_defconfig

View file

1178

arch/arm/configs/omap_generic_1610_defconfig

View file

1088

arch/arm/configs/omap_generic_1710_defconfig

View file

655

arch/arm/configs/omap_generic_2420_defconfig

View file

515

arch/arm/configs/omap_h2_1610_defconfig

View file

1120

arch/arm/configs/omap_h4_2420_defconfig

View file

1253

arch/arm/configs/omap_innovator_1510_defconfig

View file

839

arch/arm/configs/omap_innovator_1610_defconfig

View file

169

arch/arm/configs/omap_osk_5912_defconfig

View file

928

arch/arm/configs/omap_perseus2_730_defconfig

View file

148

arch/arm/configs/orion5x_defconfig

View file

761

arch/arm/configs/palmte_defconfig

View file

844

arch/arm/configs/palmtt_defconfig

View file

891

arch/arm/configs/palmz71_defconfig

View file

1118

arch/arm/configs/sx1_defconfig

View file

25

arch/arm/include/asm/byteorder.h

View file

2

arch/arm/lib/sha1.S

View file

18

arch/arm/mach-footbridge/time.c

View file

2

arch/arm/mach-integrator/impd1.c

View file

4

arch/arm/mach-ixp4xx/fsg-setup.c

View file

2

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

View file

1

arch/arm/mach-orion5x/common.h

View file

6

arch/arm/mach-orion5x/dns323-setup.c

View file

4

arch/arm/mach-orion5x/kurobox_pro-setup.c

View file

13

arch/arm/mach-orion5x/pci.c

View file

9

arch/arm/mach-orion5x/ts209-setup.c

View file

9

arch/arm/mach-orion5x/ts409-setup.c

View file

25

arch/arm/mach-pxa/clock.c

View file

5

arch/arm/mach-pxa/clock.h

View file

2

arch/arm/mach-pxa/corgi.c

View file

170

arch/arm/mach-pxa/eseries.c

View file

1

arch/arm/mach-pxa/include/mach/irqs.h

View file

2

arch/arm/mach-pxa/lubbock.c

View file

2

arch/arm/mach-pxa/poodle.c

View file

10

arch/arm/mach-pxa/pxa25x.c

View file

2

arch/arm/mach-pxa/pxa300.c

View file

2

arch/arm/mach-pxa/spitz.c

View file

10

arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h

View file

3

arch/arm/mach-s3c2410/nor-simtec.c

View file

2

arch/arm/mach-s3c2412/mach-jive.c

View file

1

arch/arm/plat-omap/clock.c

View file

12

arch/arm/plat-s3c24xx/gpiolib.c

View file

6

arch/arm/plat-s3c24xx/pwm-clock.c

View file

5

arch/arm/plat-s3c24xx/pwm.c

View file

1

arch/blackfin/Kconfig

View file

26

arch/blackfin/Makefile

View file

0

include/asm-blackfin/.gitignore → arch/blackfin/include/asm/.gitignore vendored

View file

0

include/asm-blackfin/Kbuild → arch/blackfin/include/asm/Kbuild

View file

0

include/asm-blackfin/a.out.h → arch/blackfin/include/asm/a.out.h

View file

0

include/asm-blackfin/atomic.h → arch/blackfin/include/asm/atomic.h

View file

0

include/asm-blackfin/auxvec.h → arch/blackfin/include/asm/auxvec.h

View file

0

include/asm-blackfin/bfin-global.h → arch/blackfin/include/asm/bfin-global.h

View file

0

include/asm-blackfin/bfin5xx_spi.h → arch/blackfin/include/asm/bfin5xx_spi.h

View file

0

include/asm-blackfin/bfin_simple_timer.h → arch/blackfin/include/asm/bfin_simple_timer.h

View file

0

include/asm-blackfin/bfin_sport.h → arch/blackfin/include/asm/bfin_sport.h

View file

0

include/asm-blackfin/bitops.h → arch/blackfin/include/asm/bitops.h

View file

4

include/asm-blackfin/blackfin.h → arch/blackfin/include/asm/blackfin.h

View file

0

include/asm-blackfin/bug.h → arch/blackfin/include/asm/bug.h

View file

0

include/asm-blackfin/bugs.h → arch/blackfin/include/asm/bugs.h

View file

0

include/asm-blackfin/byteorder.h → arch/blackfin/include/asm/byteorder.h

View file

0

include/asm-blackfin/cache.h → arch/blackfin/include/asm/cache.h

View file

0

include/asm-blackfin/cacheflush.h → arch/blackfin/include/asm/cacheflush.h

View file

2

include/asm-blackfin/mach-common/cdef_LPBlackfin.h → arch/blackfin/include/asm/cdef_LPBlackfin.h

View file

0

include/asm-blackfin/checksum.h → arch/blackfin/include/asm/checksum.h

View file

0

include/asm-blackfin/mach-common/clocks.h → arch/blackfin/include/asm/clocks.h

View file

0

include/asm-blackfin/mach-common/context.S → arch/blackfin/include/asm/context.S

View file

0

include/asm-blackfin/cplb-mpu.h → arch/blackfin/include/asm/cplb-mpu.h

View file

2

include/asm-blackfin/cplb.h → arch/blackfin/include/asm/cplb.h

View file

0

include/asm-blackfin/cplbinit.h → arch/blackfin/include/asm/cplbinit.h

View file

0

include/asm-blackfin/cpumask.h → arch/blackfin/include/asm/cpumask.h

View file

0

include/asm-blackfin/cputime.h → arch/blackfin/include/asm/cputime.h

View file

0

include/asm-blackfin/current.h → arch/blackfin/include/asm/current.h

View file

2

include/asm-blackfin/mach-common/def_LPBlackfin.h → arch/blackfin/include/asm/def_LPBlackfin.h

View file

2

include/asm-blackfin/delay.h → arch/blackfin/include/asm/delay.h

View file

0

include/asm-blackfin/device.h → arch/blackfin/include/asm/device.h

View file

0

include/asm-blackfin/div64.h → arch/blackfin/include/asm/div64.h

View file

0

include/asm-blackfin/dma-mapping.h → arch/blackfin/include/asm/dma-mapping.h

View file

2

include/asm-blackfin/dma.h → arch/blackfin/include/asm/dma.h

View file

0

include/asm-blackfin/dpmc.h → arch/blackfin/include/asm/dpmc.h

View file

0

include/asm-blackfin/early_printk.h → arch/blackfin/include/asm/early_printk.h

View file

0

include/asm-blackfin/elf.h → arch/blackfin/include/asm/elf.h

View file

0

include/asm-blackfin/emergency-restart.h → arch/blackfin/include/asm/emergency-restart.h

View file

0

include/asm-blackfin/entry.h → arch/blackfin/include/asm/entry.h

View file

0

include/asm-blackfin/errno.h → arch/blackfin/include/asm/errno.h

View file

0

include/asm-blackfin/fb.h → arch/blackfin/include/asm/fb.h

View file

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