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

Commit f2556896 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/defconfig

parents 7c13e6a3 10fec20e

Documentation/feature-removal-schedule.txt

+0 −13
Original line number Diff line number Diff line
@@ -205,19 +205,6 @@ Who: Tejun Heo <htejun@gmail.com> 


---------------------------



What: The arch/ppc and include/asm-ppc directories

When: Jun 2008

Why:  The arch/powerpc tree is the merged architecture for ppc32 and ppc64

      platforms.  Currently there are efforts underway to port the remaining

      arch/ppc platforms to the merged tree.  New submissions to the arch/ppc

      tree have been frozen with the 2.6.22 kernel release and that tree will

      remain in bug-fix only mode until its scheduled removal.  Platforms

      that are not ported by June 2008 will be removed due to the lack of an

      interested maintainer.

Who:  linuxppc-dev@ozlabs.org



---------------------------



What:	i386/x86_64 bzImage symlinks

When:	April 2010

MAINTAINERS

+0 −6
Original line number Diff line number Diff line
@@ -4683,12 +4683,6 @@ L: linux-wireless@vger.kernel.org 
L:	zd1211-devs@lists.sourceforge.net (subscribers-only)

S:	Maintained



ZF MACHZ WATCHDOG

P:	Fernando Fuganti

M:	fuganti@netbank.com.br

W:	http://cvs.conectiva.com.br/drivers/ZFL-watchdog/

S:	Maintained



ZR36067 VIDEO FOR LINUX DRIVER

P:	Ronald Bultje

M:	rbultje@ronald.bitfreak.net

arch/avr32/Makefile

+0 −14
Original line number Diff line number Diff line
@@ -39,20 +39,6 @@ core-y += arch/avr32/mm/ 
drivers-$(CONFIG_OPROFILE)		+= arch/avr32/oprofile/

libs-y					+= arch/avr32/lib/



archincdir-$(CONFIG_PLATFORM_AT32AP)	:= arch-at32ap



include/asm-avr32/.arch: $(wildcard include/config/platform/*.h) include/config/auto.conf

	@echo '  SYMLINK include/asm-avr32/arch -> include/asm-avr32/$(archincdir-y)'

ifneq ($(KBUILD_SRC),)

	$(Q)mkdir -p include/asm-avr32

	$(Q)ln -fsn $(srctree)/include/asm-avr32/$(archincdir-y) include/asm-avr32/arch

else

	$(Q)ln -fsn $(archincdir-y) include/asm-avr32/arch

endif

	@touch $@



archprepare: include/asm-avr32/.arch



CLEAN_FILES += include/asm-avr32/.arch include/asm-avr32/arch



BOOT_TARGETS := vmlinux.elf vmlinux.bin uImage uImage.srec

arch/avr32/boards/atngw100/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static struct eth_platform_data __initdata eth_data[2]; 
static struct spi_board_info spi0_board_info[] __initdata = {

	{

		.modalias	= "mtd_dataflash",

		.max_speed_hz	= 10000000,

		.max_speed_hz	= 8000000,

		.chip_select	= 0,

	},

};

arch/avr32/boards/atstk1000/atstk1002.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static struct mtd_partition *nand_part_info(int size, int *num_partitions) 
	return nand_partitions;

}



struct atmel_nand_data atstk1006_nand_data __initdata = {

static struct atmel_nand_data atstk1006_nand_data __initdata = {

	.cle		= 21,

	.ale		= 22,

	.rdy_pin	= GPIO_PIN_PB(30),