Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41c3e45f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5226/1: remove unmatched comment end.
  [ARM] Skip memory holes in FLATMEM when reading /proc/pagetypeinfo
  [ARM] use bcd2bin/bin2bcd
  [ARM] use the new byteorder headers
  [ARM] OMAP: Fix 2430 SMC91x ethernet IRQ
  [ARM] OMAP: Add and update OMAP default configuration files
  [ARM] OMAP: Change mailing list for OMAP in MAINTAINERS
  [ARM] S3C2443: Fix the S3C2443 clock register definitions
  [ARM] JIVE: Fix the spi bus numbering
  [ARM] S3C24XX: pwm.c: stop debugging output
  [ARM] S3C24XX: Fix sparse warnings in pwm.c
  [ARM] S3C24XX: Fix spare errors in pwm-clock driver
  [ARM] S3C24XX: Fix sparse warnings in arch/arm/plat-s3c24xx/gpiolib.c
  [ARM] S3C24XX: Fix nor-simtec driver sparse errors
  [ARM] 5225/1: zaurus: Register I2C controller for audio codecs
  [ARM] orion5x: update defconfig to v2.6.27-rc4
  [ARM] Orion: register UART1 on QNAP TS-209 and TS-409
  [ARM] Orion: activate lm75 driver on DNS-323
  [ARM] Orion: fix MAC detection on QNAP TS-209 and TS-409
  [ARM] Orion: Fix boot crash on Kurobox Pro
parents 604a2785 212496fd

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4005,7 +4005,7 @@ S: Maintained 


TI OMAP MMC INTERFACE DRIVER

P:	Carlos Aguiar, Anderson Briglia and Syed Khasim

M:	linux-omap-open-source@linux.omap.com (subscribers only)

M:	linux-omap@vger.kernel.org

W:	http://linux.omap.com

W:	http://www.muru.com/linux/omap/

S:	Maintained

arch/arm/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -810,6 +810,11 @@ config OABI_COMPAT 
	  UNPREDICTABLE (in fact it can be predicted that it won't work

	  at all). If in doubt say Y.



config ARCH_FLATMEM_HAS_HOLES

	bool

	default y

	depends on FLATMEM



config ARCH_DISCONTIGMEM_ENABLE

	bool

	default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)

arch/arm/configs/ams_delta_defconfig

0 → 100644
+1314 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/n770_defconfig

0 → 100644
+1421 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/omap_2430sdp_defconfig

0 → 100644
+1304 −0

File added.

Preview size limit exceeded, changes collapsed.