mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
cf1fb2dfa7601770037d24a328f259e2cfd97fb0
linux/drivers
History
Arnd Bergmann cf1fb2dfa7 Merge branch 'omap/headers4' into next/drivers 
This avoids merge conflicts between the omap header changes and the gpmc
updates.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-11-15 17:18:30 +01:00
..
accessibility
…
acpi
ACPI: Reorder IPMI driver before any other ACPI drivers
2012-10-16 18:07:12 -07:00
amba
…
ata
Merge branch 'samsung_platform_data' into staging/for_v3.7
2012-10-05 22:32:05 -03:00
atm
sections: fix section conflicts in drivers/atm
2012-10-06 03:04:40 +09:00
auxdisplay
…
base
memory-hotplug: update memory block's state and notify userspace
2012-10-09 16:23:02 +09:00
bcma
…
block
Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block
2012-10-11 09:04:23 +09:00
bluetooth
TTY: hci_ldisc, remove invalid check in open
2012-10-22 16:50:53 -07:00
bus
drivers: bus: omap_l3: fixup merge conflict resolution
2012-10-01 19:39:48 -07:00
cdrom
…
char
Merge tag 'omap-for-v3.8/cleanup-headers-signed' into omap-for-v3.8/cleanup-headers-serial-take2
2012-10-24 13:25:44 -07:00
clk
Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc
2012-10-02 17:26:42 -07:00
clocksource
Merge tag 'pm-for-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2012-10-02 18:32:35 -07:00
connector
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
cpufreq
cpufreq: OMAP: use get_cpu_device() instead of omap_device API
2012-10-08 14:58:56 -07:00
cpuidle
ACPI idle, CPU hotplug: Fix NULL pointer dereference during hotplug
2012-10-08 22:52:54 -04:00
crypto
Merge branch 'omap-for-v3.8/cleanup-headers-dma' into omap-for-v3.8/cleanup-headers
2012-10-17 10:01:30 -07:00
dca
…
devfreq
…
dio
…
dma
ARM: OMAP: Remove cpu_is_omap usage from plat-omap/dma.c
2012-10-31 15:37:13 -07:00
edac
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
eisa
…
extcon
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
firewire
firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel)
2012-10-09 18:26:28 +02:00
firmware
firmware/memmap: avoid type conflicts with the generic memmap_init()
2012-10-19 14:07:47 -07:00
gpio
gpio: mvebu: Add missing breaks in mvebu_gpio_irq_set_type
2012-10-17 17:40:18 +00:00
gpu
nouveau: fix warning on 32-bit build.
2012-10-16 16:40:53 +10:00
hid
Merge branch 'next' into for-linus
2012-10-11 00:45:21 -07:00
hsi
…
hv
…
hwmon
Merge branch 'vexpress-drivers' of git://git.linaro.org/people/pawelmoll/linux into next/drivers
2012-10-26 15:29:40 +02:00
hwspinlock
…
i2c
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
2012-10-11 10:27:51 +09:00
ide
sections: fix section conflicts in drivers/ide
2012-10-06 03:04:41 +09:00
idle
…
iio
…
infiniband
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-10-10 19:52:19 +09:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-10-13 10:56:03 +09:00
iommu
Merge tag 'iommu-updates-v3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2012-10-08 06:33:44 +09:00
irqchip
…
isdn
isdn: fix a wrapping bug in isdn_ppp_ioctl()
2012-10-10 22:50:45 -04:00
leds
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2012-10-10 20:14:07 +09:00
lguest
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
macintosh
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
md
Merge tag 'md-3.7' of git://neil.brown.name/md
2012-10-13 13:22:01 -07:00
media
ARM: OMAP: Move omap-pm-noop.c local to mach-omap2
2012-10-31 15:37:13 -07:00
memory
…
memstick
…
message
…
mfd
Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup-headers
2012-10-25 12:21:48 -07:00
misc
Merge tag 'for-3.7-rc1' of git://gitorious.org/linux-pwm/linux-pwm
2012-10-10 20:15:24 +09:00
mmc
Merge branch 'omap-for-v3.8/cleanup-headers-mmc' into omap-for-v3.8/cleanup-headers
2012-10-17 11:13:42 -07:00
mtd
ARM: OMAP2+: fix build breakage introduced by commit b7754452b3
2012-10-26 13:16:30 -06:00
net
bnx2x: fix handling mf storage modes
2012-10-16 14:41:47 -04:00
nfc
…
nubus
…
of
of/platform: sparse fix
2012-10-17 15:53:03 -05:00
oprofile
mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file
2012-10-09 16:22:18 +09:00
parisc
…
parport
Merge tag 'xtensa-next-20121008' of git://github.com/czankel/xtensa-linux
2012-10-09 16:11:46 +09:00
pci
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
pcmcia
Merge tag 'omap-for-v3.8/cleanup-headers-signed' into omap-for-v3.8/cleanup-headers-serial-take2
2012-10-24 13:25:44 -07:00
pinctrl
pinctrl/nomadik: always use the simple irqdomain
2012-10-15 09:09:27 +02:00
platform
Merge branches 'fixes-for-37', 'ec' and 'thermal' into release
2012-10-09 01:47:35 -04:00
pnp
…
power
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-10-13 11:27:59 +09:00
pps
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
ps3
…
ptp
…
pwm
Merge tag 'for-3.7-rc1' of git://gitorious.org/linux-pwm/linux-pwm
2012-10-10 20:15:24 +09:00
rapidio
rapidio: update for destination ID allocation
2012-10-11 08:50:15 +09:00
regulator
Merge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2012-10-05 12:01:30 +09:00
remoteproc
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
rpmsg
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
rtc
rtc: kconfig: fix RTC_INTF defaults connected to RTC_CLASS
2012-10-11 08:50:16 +09:00
s390
qeth: fix deadlock between recovery and bonding driver
2012-10-16 14:41:46 -04:00
sbus
…
scsi
Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes
2012-10-19 15:40:18 -07:00
sfi
…
sh
sh: Fix up more fallout from pointless ARM __iomem churn.
2012-10-15 14:08:48 +09:00
sn
…
spi
Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes
2012-10-19 15:40:18 -07:00
ssb
…
staging
Merge tag 'omap-for-v3.8/cleanup-headers-signed' into omap-for-v3.8/cleanup-headers-serial-take2
2012-10-24 13:25:44 -07:00
target
Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block
2012-10-11 09:04:23 +09:00
tc
…
thermal
thermal, cpufreq: Fix build when CPU_FREQ_TABLE isn't configured
2012-10-15 14:00:07 -07:00
tty
tty/serial/8250: Make omap hardware workarounds local to 8250.h
2012-10-24 11:30:57 -07:00
uio
mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
2012-10-09 16:22:19 +09:00
usb
Merge branch 'omap-for-v3.8/cleanup-headers-usb' into omap-for-v3.8/cleanup-headers
2012-10-24 15:05:45 -07:00
uwb
…
vfio
vfio: Fix PCI INTx disable consistency
2012-10-10 09:10:32 -06:00
vhost
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-10-10 19:52:19 +09:00
video
Merge tag 'omap-for-v3.8/cleanup-headers-signed' into omap-for-v3.8/cleanup-headers-serial-take2
2012-10-24 13:25:44 -07:00
virt
…
virtio
…
vlynq
…
vme
…
w1
Merge tag 'char-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2012-10-01 12:09:59 -07:00
watchdog
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
2012-10-07 21:06:10 +09:00
xen
xen: Fix annoying compile-time warning
2012-10-19 11:54:21 -07:00
zorro
…
Kconfig
Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-10-01 18:46:13 -07:00
Makefile
IPMI: Change link order
2012-10-16 18:07:12 -07:00