breeze/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-02-04 15:28:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
cd3decdfd1dbab8a585eafe2e5b9866f193de99e
linux/arch/arm
History
David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.

Signed-off-by: David S. Miller <davem@davemloft.net>
2011-12-23 17:13:56 -05: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: 7177/1: GIC: avoid skipping non-existent PPIs in irq_start calculation
2011-11-26 21:58:55 +00:00
configs
ARM: OMAP1: Remove unsafe clock values from omap1_defconfig
2011-12-01 17:49:11 -08:00
include/asm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-12-23 17:13:56 -05:00
kernel
ARM: unwinder: fix bisection to find origin in .idx section
2011-12-15 14:02:19 -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
ARM: 7154/1: mach-bcmring: fix build error in dma.c
2011-11-09 21:53:35 +00:00
mach-clps711x
…
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
…
mach-ep93xx
Merge git://git.infradead.org/mtd-2.6
2011-11-07 09:11:16 -08:00
mach-exynos
ARM: EXYNOS: Fix build error without CONFIG_LOCAL_TIMERS
2011-12-08 10:09:32 +09:00
mach-footbridge
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-gemini
…
mach-h720x
…
mach-highbank
ARM: highbank: convert logical CPU numbers to physical numbers
2011-11-16 10:56:53 +00:00
mach-imx
Merge branch 'imx/fix-irqdomain' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
2011-12-06 14:15:02 +00:00
mach-integrator
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-iop13xx
arm: Add export.h to ARM specific files as required.
2011-10-31 19:30:50 -04:00
mach-iop32x
…
mach-iop33x
…
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
…
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
…
mach-l7200/include/mach
…
mach-lpc32xx
…
mach-mmp
ARM: pxa168/gplugd: add the correct SSP device
2011-11-17 08:21:58 +08:00
mach-msm
Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2011-12-09 08:08:14 -08:00
mach-mv78xx0
…
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
…
mach-omap1
ARM: OMAP1: recalculate loops per jiffy after dpll1 reprogram
2011-12-05 09:28:32 -08:00
mach-omap2
ARM: OMAP: rx51: fix USB
2011-12-13 13:49:03 -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
…
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
Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:34:22 -07:00
mach-rpc
…
mach-s3c64xx
ARM: S3C64XX: Staticise s3c6400_sysclass
2011-12-02 14:18:02 +09:00
mach-s3c2410
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-s3c2412
Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc
2011-11-05 18:18:05 -07:00
mach-s3c2416
Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc
2011-11-05 18:21:21 -07:00
mach-s3c2440
Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc
2011-11-05 18:18:05 -07:00
mach-s3c2443
Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc
2011-11-05 18:21:21 -07:00
mach-s5p64x0
Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc
2011-11-05 18:18:05 -07:00
mach-s5pc100
Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc
2011-11-05 18:18:05 -07:00
mach-s5pv210
ARM: S5PV210: Set 1000ns as PWM backlight period on SMDKV210
2011-12-08 10:09:30 +09:00
mach-sa1100
ARM: sa1100: fix build error
2011-12-08 14:55:57 +08:00
mach-shark
…
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
…
mach-spear6xx
…
mach-tcc8k
…
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
…
mach-vexpress
Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:34:22 -07:00
mach-vt8500
…
mach-w90x900
ARM: 7158/1: add new MFP implement for NUC900
2011-11-12 11:33:08 +00:00
mach-zynq
…
mm
ARM: 7172/1: dma: Drop GFP_COMP for DMA memory allocations
2011-11-26 21:58:53 +00:00
nwfpe
…
oprofile
…
plat-iop
arm: Add export.h to ARM specific files as required.
2011-10-31 19:30:50 -04:00
plat-mxc
ARM: imx: fix cpufreq build errors
2011-12-09 11:01:18 +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
…
plat-pxa
Merge git://git.infradead.org/mtd-2.6
2011-11-07 09:11:16 -08:00
plat-s3c24xx
ARM: SAMSUNG: inclusion export.h instead of module.h
2011-11-17 01:14:38 +09:00
plat-s5p
ARM: S5P: Fix export.h inclusion
2011-11-17 01:13:34 +09:00
plat-samsung
ARM: SAMSUNG: remove duplicated header include
2011-12-08 10:09:29 +09:00
plat-spear
…
plat-tcc
…
plat-versatile
…
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: 7186/1: fix Kconfig issue with PHYS_OFFSET and !MMU
2011-12-06 11:16:13 +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