linux/arch/arm
Linus Torvalds 51399a3919 Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (38 commits)
  kbuild: convert `arch/tile' to the kconfig mainmenu upgrade
  README: cite nconfig
  Revert "kconfig: Temporarily disable dependency warnings"
  kconfig: Use PATH_MAX instead of 128 for path buffer sizes.
  kconfig: Fix realloc usage()
  kconfig: Propagate const
  kconfig: Don't go out from read config loop when you read new symbol
  kconfig: fix menuconfig on debian lenny
  kbuild: migrate all arch to the kconfig mainmenu upgrade
  kconfig: expand file names
  kconfig: use the file's name of sourced file
  kconfig: constify file name
  kconfig: don't emit warning upon rootmenu's prompt redefinition
  kconfig: replace KERNELVERSION usage by the mainmenu's prompt
  kconfig: delay gconf window initialization
  kconfig: expand by default the rootmenu's prompt
  kconfig: add a symbol string expansion helper
  kconfig: regen parser
  kconfig: implement the `mainmenu' directive
  kconfig: allow PACKAGE to be defined on the compiler's command-line
  ...

Fix up trivial conflict in arch/mn10300/Kconfig
2010-10-28 16:16:39 -07:00
..
boot
common Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
configs AT91: add board support for Pcontrol_G20 2010-10-26 11:32:47 +02:00
include/asm mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
kernel ptrace: cleanup arch_ptrace() on ARM 2010-10-27 18:03:10 -07:00
lib
mach-aaec2000
mach-at91 at91/atmel-mci: inclusion of sd/mmc driver in at91sam9g45 chip and board 2010-10-26 11:32:49 +02:00
mach-bcmring
mach-clps711x
mach-cns3xxx
mach-davinci Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci 2010-10-25 10:59:31 -07:00
mach-dove
mach-ebsa110
mach-ep93xx replace nested max/min macros with {max,min}3 macro 2010-10-26 16:52:12 -07:00
mach-footbridge
mach-gemini
mach-h720x
mach-imx Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 2010-10-27 19:04:36 -07:00
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-ixp23xx
mach-ixp2000
mach-kirkwood Kirkwood: add fan support for Network Space Max v2 2010-10-25 14:11:37 -07:00
mach-ks8695
mach-l7200/include/mach
mach-lh7a40x
mach-loki
mach-lpc32xx
mach-mmp
mach-msm Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
mach-mv78xx0
mach-mx3 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2010-10-28 09:35:11 -07:00
mach-mx5
mach-mx25
mach-mxc91231
mach-netx
mach-nomadik
mach-ns9xxx
mach-nuc93x
mach-omap1 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2010-10-25 13:46:56 -07:00
mach-omap2 omap4: pandaboard: fix up mmc card detect logic 2010-10-29 00:30:32 +02:00
mach-orion5x
mach-pnx4008
mach-pxa Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2010-10-28 09:35:11 -07:00
mach-realview
mach-rpc
mach-s3c24a0/include/mach
mach-s3c64xx mfd: Factor out WM831x I2C I/O from the core driver 2010-10-29 00:30:24 +02:00
mach-s3c2400
mach-s3c2410
mach-s3c2412
mach-s3c2416
mach-s3c2440 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
mach-s3c2443
mach-s5p64x0
mach-s5p6442
mach-s5pc100
mach-s5pv210
mach-s5pv310
mach-sa1100 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
mach-shark
mach-shmobile ARM: mach-shmobile: ap4evb: Fix hotplug for SDHI1 2010-10-29 00:29:14 +02:00
mach-spear3xx
mach-spear6xx
mach-stmp37xx
mach-stmp378x
mach-tcc8k
mach-tegra Remove duplicate includes from many files 2010-10-27 18:03:18 -07:00
mach-u300
mach-ux500 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 2010-10-27 19:04:36 -07:00
mach-versatile
mach-vexpress
mach-w90x900
mm mm: fix race in kunmap_atomic() 2010-10-27 18:03:05 -07:00
nwfpe
oprofile
plat-iop
plat-mxc Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 2010-10-27 19:04:36 -07:00
plat-nomadik Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 2010-10-27 19:04:36 -07:00
plat-omap Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
plat-orion
plat-pxa mmc: add new sdhci-pxa driver for Marvell SoCs 2010-10-25 09:29:07 +08:00
plat-s3c24xx
plat-s5p
plat-samsung Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2010-10-25 08:32:05 -07:00
plat-spear
plat-stmp3xxx
plat-tcc
plat-versatile
tools
vfp
Kconfig Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 2010-10-28 16:16:39 -07:00
Kconfig-nommu
Kconfig.debug
Makefile