Arnd Bergmann 5b02ee3d21 asm-generic: merge branch 'master' of torvalds/linux-2.6 ...

Fixes a merge conflict against the x86 tree caused by a fix to
atomic.h which I renamed to atomic_long.h.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2009-06-12 11:32:58 +02:00

..

boards

sh: add AP325RXA mode pin configuration

2009-06-11 09:09:33 +03:00

boot

sh: Merge the split arch/sh/boot/compressed/ Makefiles.

2009-05-10 00:58:21 +09:00

cchips

sh: mach-hp6xx: Fix up the hp6xx build for hd64461 changes.

2009-05-20 11:27:13 +09:00

configs

sh: fix CONFIG_SH_PCLK_FREQ bug for sh7724

2009-06-02 12:08:52 +09:00

drivers

sh: pci-sh7780: Fix up for PCI_DISABLE_MWI changes.

2009-05-27 00:12:58 +09:00

include

asm-generic: merge branch 'master' of torvalds/linux-2.6

2009-06-12 11:32:58 +02:00

kernel

sh: Tie sparseirq in to Kconfig.

2009-06-11 10:33:09 +03:00

lib

sh: Handle calling csum_partial with misaligned data

2009-01-29 11:56:02 +09:00

lib64

sh: Provide an __sdivsi3_2 export for sh64.

2009-05-09 17:57:21 +09:00

math-emu

sh: Fix up the math-emu build.

2007-06-11 15:57:42 +09:00

mm

sh: Prefer slab_is_available() over after_bootmem.

2009-05-22 14:21:03 +09:00

oprofile

sh: Add support for SH7724 (SH-Mobile R2R) CPU subtype.

2009-04-16 14:40:56 +09:00

tools

sh: Record ms7724se in mach-types.

2009-05-26 17:02:18 +09:00

Kconfig

sh: Tie sparseirq in to Kconfig.

2009-06-11 10:33:09 +03:00

Kconfig.cpu

sh: Tidy up SH-4A boot_cpu_data.flags probing.

2009-06-01 19:50:08 +09:00

Kconfig.debug

sh: Kill off extra cflags Kconfig entry.

2009-05-08 20:20:56 +09:00

Makefile

sh: plug vsyscall dir in to archclean.

2009-06-10 09:48:33 +03:00