Pandora Sourcecodes - pandora-kernel.git/commit

git.openpandora.org / pandora-kernel.git / commit

author	Olof Johansson <olof@lixom.net>
	Mon, 1 Oct 2012 21:15:02 +0000 (14:15 -0700)
committer	Olof Johansson <olof@lixom.net>
	Mon, 1 Oct 2012 21:15:02 +0000 (14:15 -0700)
commit	ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8
tree	3ca115b6580b70b20d21da179f004b14f54edc8e	tree \| snapshot
parent	17a505edb09495510ac8998450980472c412455b	commit \| diff
parent	9cf1c871526cf6bfec2a653e1e068ee72592542c	commit \| diff

Merge branch 'next/cleanup' into HEAD

Conflicts:
drivers/staging/tidspbridge/core/wdt.c
drivers/usb/host/Kconfig
drivers/w1/masters/omap_hdq.c

36 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/bios32.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/include/mach/map.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/io.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/gpio.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap-wakeupgen.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_phy_internal.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/twl-common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/usb-musb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_eb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb1176.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb11mp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pba8.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pbx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-kzm9g.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/pcie.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/cpu-db8500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/devs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap_hsmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-omap2-mcspi.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/core/dsp-clock.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/core/tiomap3430.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/core/tiomap3430_pwr.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/core/wdt.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/rmgr/drv_interface.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-nxp.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/tusb6010_omap.c	diff1 \|	diff2 \|	blob \| history

Pandora Kernel Repository

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/bios32.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/include/mach/map.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/io.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/gpio.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap-wakeupgen.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_phy_internal.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/twl-common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/usb-musb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_eb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb1176.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb11mp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pba8.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pbx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-kzm9g.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/pcie.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/cpu-db8500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/devs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap_hsmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-omap2-mcspi.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/core/dsp-clock.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/core/tiomap3430.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/core/tiomap3430_pwr.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/core/wdt.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tidspbridge/rmgr/drv_interface.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-nxp.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/tusb6010_omap.c	diff1 \|	diff2 \|	blob \| history