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

Commit 7e31aa11 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5182/1: pxa: Fix pcm990 compilation
  [ARM] Fix explicit asm(-arm)?/arch-foo references
  [ARM] move include/asm-arm to arch/arm/include/asm
  [ARM] Remove explicit dependency for misc.o from compressed/Makefile
  [ARM] initrd: claim initrd memory exclusively
  [ARM] pxa: add support for L2 outer cache on XScale3 (attempt 2)
  [ARM] 5180/1: at91: Fix at91_nand -> atmel_nand rename fallout
  [ARM] add Sascha Hauer as Freescale i.MX Maintainer
  [ARM] i.MX: add missing clock functions exports
  [ARM] i.MX: remove set_imx_fb_info() export
  [ARM] mx1ads: make mmc platform data available for modules
  [ARM] mx2: add missing Kconfig dependency
parents 071f4924 9cb7117f

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -502,6 +502,12 @@ L: openezx-devel@lists.openezx.org (subscribers-only) 
W:	http://www.openezx.org/

S:	Maintained



ARM/FREESCALE IMX / MXC ARM ARCHITECTURE

P:	Sascha Hauer

M:	kernel@pengutronix.de

L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/GLOMATION GESBC9312SX MACHINE SUPPORT

P:	Lennert Buytenhek

M:	kernel@wantstofly.org

arch/arm/boot/compressed/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -112,6 +112,3 @@ $(obj)/font.c: $(FONTC) 


$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config

	@sed "$(SEDFLAGS)" < $< > $@
 


$(obj)/misc.o: $(obj)/misc.c include/asm/arch/uncompress.h lib/inflate.c

include/asm-arm/Kbuild→arch/arm/include/asm/Kbuild

+0 −0

File moved.

View file

include/asm-arm/a.out.h→arch/arm/include/asm/a.out.h

+0 −0

File moved.

View file