apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity
Files
ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df
linux-apfs/arch/arm
T
History
Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2012-01-06 11:42:52 -08:00
..
boot
Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-11-20 14:34:58 -08:00
common
ARM: 7237/1: PL330: Fix driver freeze
2011-12-23 22:57:26 +00:00
configs
imx_v4_v5_defconfig: update default configuration
2011-12-19 12:26:06 +01:00
include/asm
Merge branch 'driver-core-next' into Linux 3.2
2012-01-06 11:42:52 -08:00
kernel
Merge branch 'driver-core-next' into Linux 3.2
2012-01-06 11:42:52 -08:00
lib
ARM: 7171/1: unwind: add unwind directives to bitops assembly macros
2011-11-26 21:58:53 +00:00
mach-at91
ARM: at91: Fix USB AT91 gadget registration
2011-11-30 17:27:21 +01:00
mach-bcmring
Merge branch 'driver-core-next' into Linux 3.2
2012-01-06 11:42:52 -08:00
mach-clps711x
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-cns3xxx
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-davinci
ARM: davinci: dm365 evm: align nand partition table to u-boot
2011-12-05 16:47:19 +05:30
mach-dove
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-ebsa110
Merge branch 'dt/gic' into highbank/soc
2011-10-31 14:11:34 +01:00
mach-ep93xx
Merge git://git.infradead.org/mtd-2.6
2011-11-07 09:11:16 -08:00
mach-exynos
Merge branch 'driver-core-next' into Linux 3.2
2012-01-06 11:42:52 -08:00
mach-footbridge
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-gemini
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-h720x
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-highbank
ARM: highbank: convert logical CPU numbers to physical numbers
2011-11-16 10:56:53 +00:00
mach-imx
cpuimx35: fix touchscreen support
2011-12-19 12:26:09 +01:00
mach-integrator
driver-core: remove sysdev.h usage.
2011-12-21 16:26:03 -08:00
mach-iop13xx
arm: Add export.h to ARM specific files as required.
2011-10-31 19:30:50 -04:00
mach-iop32x
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-iop33x
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-ixp4xx
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
mach-ixp23xx
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-ixp2000
arm: Add export.h to ARM specific files as required.
2011-10-31 19:30:50 -04:00
mach-kirkwood
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2011-11-07 10:13:52 -08:00
mach-ks8695
driver-core: remove sysdev.h usage.
2011-12-21 16:26:03 -08:00
mach-l7200/include/mach
…
mach-lpc32xx
driver-core: remove sysdev.h usage.
2011-12-21 16:26:03 -08:00
mach-mmp
ARM: pxa168/gplugd: add the correct SSP device
2011-11-17 08:21:58 +08:00
mach-msm
Merge branch 'driver-core-next' into Linux 3.2
2012-01-06 11:42:52 -08:00
mach-mv78xx0
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-mx5
Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
2011-12-13 16:34:25 +00:00
mach-mxs
ARM: mx28: LRADC macro rename
2011-12-02 13:27:23 +08:00
mach-netx
arm: Add export.h to ARM specific files as required.
2011-10-31 19:30:50 -04:00
mach-nomadik
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-omap1
ARM: OMAP1: recalculate loops per jiffy after dpll1 reprogram
2011-12-05 09:28:32 -08:00
mach-omap2
Merge branch 'fixes-hwmod-regression' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
2011-12-20 09:56:00 -08:00
mach-orion5x
Merge git://git.infradead.org/mtd-2.6
2011-11-07 09:11:16 -08:00
mach-picoxcell
ARM: picoxcell: add extra temp register to addruart
2011-11-09 09:51:42 +00:00
mach-pnx4008
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-prima2
ARM: CSR: PM: fix build error due to undeclared 'THIS_MODULE'
2011-12-02 11:03:41 +08:00
mach-pxa
ARM: pxa: fix inconsistent CONFIG_USB_PXA27X
2011-11-10 15:32:27 +08:00
mach-realview
driver-core: remove sysdev.h usage.
2011-12-21 16:26:03 -08:00
mach-rpc
Merge branch 'dt/gic' into highbank/soc
2011-10-31 14:11:34 +01:00
mach-s3c64xx
Merge branch 'driver-core-next' into Linux 3.2
2012-01-06 11:42:52 -08:00
mach-s3c2410
arm: fix up some samsung merge sysdev conversion problems
2012-01-06 11:19:24 -08:00
mach-s3c2412
arm: fix up some samsung merge sysdev conversion problems
2012-01-06 11:19:24 -08:00
mach-s3c2416
arm: convert sysdev_class to a regular subsystem
2011-12-21 16:01:38 -08:00
mach-s3c2440
arm: fix up some samsung merge sysdev conversion problems
2012-01-06 11:19:24 -08:00
mach-s3c2443
driver-core: remove sysdev.h usage.
2011-12-21 16:26:03 -08:00
mach-s5p64x0
arm: fix up some samsung merge sysdev conversion problems
2012-01-06 11:19:24 -08:00
mach-s5pc100
arm: fix up some samsung merge sysdev conversion problems
2012-01-06 11:19:24 -08:00
mach-s5pv210
Merge branch 'driver-core-next' into Linux 3.2
2012-01-06 11:42:52 -08:00
mach-sa1100
ARM: sa1100: fix build error
2011-12-08 14:55:57 +08:00
mach-shark
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-shmobile
Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh
2011-12-20 11:32:18 -08:00
mach-spear3xx
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-spear6xx
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-tcc8k
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-tegra
arm/tegra: enable headphone detection gpio on seaboard
2011-11-09 11:31:16 -08:00
mach-u300
Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6
2011-11-03 09:40:51 -07:00
mach-ux500
Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6
2011-11-03 09:40:51 -07:00
mach-versatile
driver-core: remove sysdev.h usage.
2011-12-21 16:26:03 -08:00
mach-vexpress
driver-core: remove sysdev.h usage.
2011-12-21 16:26:03 -08:00
mach-vt8500
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-w90x900
Merge branch 'driver-core-next' into Linux 3.2
2012-01-06 11:42:52 -08:00
mach-zynq
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mm
ARM: 7197/1: errata: Remove SMP dependency for erratum 751472
2011-12-23 22:34:48 +00:00
nwfpe
…
oprofile
oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue
2011-12-23 11:58:34 +01:00
plat-iop
arm: Add export.h to ARM specific files as required.
2011-10-31 19:30:50 -04:00
plat-mxc
enable uncompress log on cpuimx35sd
2011-12-19 12:26:09 +01:00
plat-nomadik
Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:18:05 -07:00
plat-omap
Merge branch 'fixes-dss' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
2011-11-24 15:58:01 +00:00
plat-orion
ARM: plat-orion: make gpiochip label unique
2011-12-19 20:55:36 -08:00
plat-pxa
Merge git://git.infradead.org/mtd-2.6
2011-11-07 09:11:16 -08:00
plat-s3c24xx
Merge branch 'driver-core-next' into Linux 3.2
2012-01-06 11:42:52 -08:00
plat-s5p
Merge branch 'driver-core-next' into Linux 3.2
2012-01-06 11:42:52 -08:00
plat-samsung
Merge branch 'driver-core-next' into Linux 3.2
2012-01-06 11:42:52 -08:00
plat-spear
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
plat-tcc
ARM: plat-tcc: remove mach/memory.h
2011-10-13 12:49:42 -04:00
plat-versatile
ARM: versatile: convert logical CPU numbers to physical numbers
2011-10-17 10:01:11 +01:00
tools
ARM: Update mach-types to fix mxs build breakage
2011-11-17 07:49:17 +08:00
vfp
arm: remove several unnecessary module.h include instances
2011-10-31 19:30:48 -04:00
Kconfig
ARM: 7197/1: errata: Remove SMP dependency for erratum 751472
2011-12-23 22:34:48 +00:00
Kconfig-nommu
…
Kconfig.debug
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00
Makefile
ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos
2011-11-06 13:54:56 +09:00