suyu-github/horinux
0
0
Fork 0
mirror of https://github.com/suyu-emu/horinux.git synced 2026-09-21 14:15:21 -07:00
Code Issues Packages Projects Releases Wiki Activity
Files
e3a66aa33a8f06924f67770e15c22a5c52df314e
horinux/drivers
T
History
Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform 
* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-22 01:07:21 -07:00
..
accessibility
…
acpi
ACPI / PM: Use KERN_DEBUG when no power resources are found
2012-09-14 20:54:44 +02:00
amba
…
ata
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
atm
…
auxdisplay
…
base
…
bcma
…
block
…
bluetooth
Merge tag 'tegra-for-3.7-dmaengine' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup
2012-09-20 19:57:38 -07:00
cdrom
…
char
…
clk
Merge branch 'next/soc' into next/multiplatform
2012-09-20 21:27:41 -07:00
clocksource
ARM: bcm2835: add system timer
2012-09-19 19:08:46 -06:00
connector
…
cpufreq
…
cpuidle
…
crypto
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
dca
…
devfreq
…
dio
…
dma
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
edac
…
eisa
…
extcon
Merge tag 'mfd-for-linus-3.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2012-09-16 13:22:21 -07:00
firewire
…
firmware
…
gpio
Merge branch 'next/dt' into next/multiplatform
2012-09-20 21:16:43 -07:00
gpu
drm/nouveau: fix booting with plymouth + dumb support
2012-09-14 15:45:01 +10:00
hid
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2012-09-07 12:29:38 -07:00
hsi
…
hv
…
hwmon
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
hwspinlock
…
i2c
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
ide
…
idle
…
ieee802154
…
iio
…
infiniband
…
input
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
iommu
…
irqchip
ARM: bcm2835: add interrupt controller driver
2012-09-19 19:08:37 -06:00
isdn
Merge tag 'tegra-for-3.7-dmaengine' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup
2012-09-20 19:57:38 -07:00
leds
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
lguest
…
macintosh
…
md
…
media
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
memory
…
memstick
…
message
…
mfd
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
misc
…
mmc
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mtd
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
net
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
nfc
…
nubus
…
of
…
oprofile
…
parisc
…
parport
…
pci
…
pcmcia
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
pinctrl
Merge branch 'next/dt' into next/multiplatform
2012-09-20 21:16:43 -07:00
platform
thinkpad_acpi: buffer overflow in fan_get_status()
2012-09-13 16:46:31 -04:00
pnp
…
power
ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ
2012-09-12 18:06:30 -07:00
pps
…
ps3
…
ptp
…
pwm
pwm: pwm-tiehrpwm: Fix conflicting channel period setting
2012-09-10 17:04:38 +02:00
rapidio
…
regulator
Merge tag 'tegra-for-3.7-dmaengine' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup
2012-09-20 19:57:38 -07:00
remoteproc
ARM: omap: move platform_data definitions
2012-09-19 17:39:52 +02:00
rpmsg
…
rtc
Merge tag 'omap-devel-dt-merged-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
2012-09-20 13:22:20 -07:00
s390
Merge branch 'depends/tty-omap-serial' into next/cleanup
2012-09-16 20:04:39 -07:00
sbus
…
scsi
…
sfi
…
sh
ARM: shmobile: move custom gpio functions to sh-gpio.h
2012-09-14 09:21:58 -05:00
sn
…
spi
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
ssb
…
staging
Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform
2012-09-20 22:54:07 -07:00
target
target: go through normal processing for zero-length REQUEST_SENSE
2012-09-07 11:32:54 -07:00
tc
…
thermal
…
tty
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
uio
…
usb
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
uwb
…
vfio
…
vhost
…
video
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
virt
…
virtio
…
vlynq
…
vme
…
w1
W1: OMAP HDQ1W: Remove dependencies to mach/hardware.h
2012-09-12 18:06:30 -07:00
watchdog
Merge tag 'omap-cleanup-sparseirq-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
2012-09-16 20:05:06 -07:00
xen
xen/pciback: Fix proper FLR steps.
2012-09-06 09:22:02 -04:00
zorro
…
Kconfig
ARM: bcm2835: add interrupt controller driver
2012-09-19 19:08:37 -06:00
Makefile
ARM: bcm2835: add interrupt controller driver
2012-09-19 19:08:37 -06:00