mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-06-06 05:39:29 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
df80442d1ee2902c2e39f90f18160f2e08d14c06
linux/drivers
History
Arnd Bergmann df80442d1e Merge branch 'depends/rmk/memory_h' into next/cleanup2 
Theis resolves lots of simple conflicts between the omap
cleanup and the mach/memory.h removal series.

Conflicts:
	arch/arm/mach-imx/mach-cpuimx27.c
	arch/arm/mach-omap1/board-ams-delta.c
	arch/arm/mach-omap1/board-generic.c
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-h3.c
	arch/arm/mach-omap1/board-nokia770.c
	arch/arm/mach-omap1/board-osk.c
	arch/arm/mach-omap1/board-palmte.c
	arch/arm/mach-omap1/board-palmtt.c
	arch/arm/mach-omap1/board-palmz71.c
	arch/arm/mach-omap1/board-sx1.c
	arch/arm/mach-omap1/board-voiceblue.c
	arch/arm/mach-omap1/io.c
	arch/arm/mach-omap2/board-generic.c
	arch/arm/mach-omap2/io.c
	arch/arm/plat-omap/io.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-11-01 13:47:27 +01:00
..
accessibility
…
acpi
Merge branches 'apei', 'bz-13195' and 'doc' into acpi
2011-09-12 20:00:00 -04:00
amba
…
ata
drivers/ata/sata_dwc_460ex.c: add missing kfree
2011-08-18 23:58:11 -04:00
atm
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
auxdisplay
…
base
PM / Clocks: Do not acquire a mutex under a spinlock
2011-09-26 19:40:23 +02:00
bcma
bcma: add uevent to the bus, to autoload drivers
2011-08-22 14:21:41 -04:00
block
floppy: use del_timer_sync() in init cleanup
2011-09-21 10:22:11 +02:00
bluetooth
Bluetooth: add support for 2011 mac mini
2011-09-17 17:16:03 -03:00
cdrom
drivers/cdrom/cdrom.c: relax check on dvd manufacturer value
2011-08-02 12:43:50 +02:00
char
TPM: Zero buffer after copying to userspace
2011-09-23 09:46:41 +10:00
clk
ARM: Consolidate the clkdev header files
2011-07-19 18:09:45 +02:00
clocksource
Merge branch 'common/core' into sh-latest
2011-08-08 16:33:54 +09:00
connector
proc_fork_connector: a lockless ->real_parent usage is not safe
2011-07-28 18:26:32 -07:00
cpufreq
drivers/cpufreq/pcc-cpufreq.c: avoid NULL pointer dereference
2011-09-14 18:09:38 -07:00
cpuidle
cpuidle: stop depending on pm_idle
2011-08-03 19:06:37 -04:00
crypto
n2_crypto: Attach on Niagara-T3.
2011-07-28 01:30:07 -07:00
dca
…
dio
…
dma
dmaengine/ste_dma40: fix memory leak due to prepared descriptors
2011-09-05 17:08:26 +05:30
edac
i7core_edac: fixed typo in error count calculation
2011-08-18 14:07:15 -07:00
eisa
eisa/pci_eisa.c: fix BUG introduced by 005bdad7b8
2011-08-04 06:32:51 -10:00
firewire
firewire: ohci: add no MSI quirk for O2Micro controller
2011-09-16 22:22:10 +02:00
firmware
firmware: fix google/gsmi.c build warning
2011-08-08 13:53:49 -07:00
gpio
drivers/gpio/gpio-generic.c: fix build errors
2011-09-14 18:09:38 -07:00
gpu
drm/radeon/kms: fix DDIA enable on some rs690 systems
2011-09-23 14:02:18 +01:00
hid
Merge branch 'for-linus' of git://github.com/dtor/input
2011-09-16 14:09:19 -07:00
hwmon
hwmon: (coretemp) remove struct platform_data * parameter from create_core_data()
2011-09-23 10:39:11 -07:00
hwspinlock
…
i2c
i2c-tegra: fix possible race condition after tx
2011-09-07 00:13:40 +01:00
ide
drivers/ide/cy82c693.c: Add missing pci_dev_put
2011-08-04 01:30:34 -07:00
idle
…
ieee802154
…
infiniband
Merge branches 'ipoib' and 'iser' into for-next
2011-08-17 10:57:43 -07:00
input
Merge branch 'for-linus' of git://github.com/dtor/input
2011-09-16 14:09:19 -07:00
iommu
x86, iommu: Mark DMAR IRQ as non-threaded
2011-09-13 23:44:53 +02:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-07-28 05:58:19 -07:00
leds
drivers/leds/ledtrig-timer.c: fix broken sysfs delay handling
2011-09-14 18:09:38 -07:00
lguest
lguest: Fix in/out emulation
2011-07-22 14:39:51 +09:30
macintosh
drivers: fix up various ->llseek() implementations
2011-07-20 20:47:58 -04:00
mca
…
md
md: Fix handling for devices from 2TB to 4TB in 0.90 metadata.
2011-09-10 17:21:28 +10:00
media
[media] vp7045: fix buffer setup
2011-09-11 09:33:41 -03:00
memstick
…
message
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2011-07-30 08:36:02 -10:00
mfd
mfd: Fix omap-usb-host build failure
2011-09-06 16:37:59 +02:00
misc
drivers/misc/pti.c: give 'comm' function scope in pti_control_frame_built_and_sent()
2011-09-14 18:09:38 -07:00
mmc
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2011-09-21 13:20:21 -07:00
mtd
UBI: do not link debug messages when debugging is disabled
2011-08-19 19:02:27 +03:00
net
ixgbe: fix possible null buffer error
2011-09-21 02:14:13 -04:00
nfc
NFC: pn533: use after free in pn533_disconnect()
2011-07-26 16:27:24 -04:00
nubus
…
of
of: Add helpers to get one string in multiple strings property
2011-10-04 09:52:23 -07:00
oprofile
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
parisc
…
parport
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2011-07-25 23:09:27 -07:00
pci
pci: Don't crash when reading mpss from root complex
2011-09-13 16:08:31 -07:00
pcmcia
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2011-07-31 06:23:08 -10:00
platform
acer-wmi: support Lenovo ideapad S205 wifi switch
2011-08-05 15:21:52 -04:00
pnp
Merge 'akpm' patch series
2011-07-25 21:00:19 -07:00
power
s3c-adc-battery: Fix compilation error due to missing header (module.h)
2011-08-19 21:01:46 +04:00
pps
…
ps3
…
ptp
…
rapidio
rapidio: fix use of non-compatible registers
2011-08-25 16:25:34 -07:00
regulator
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
2011-08-01 14:05:46 -10:00
rtc
drivers/rtc/rtc-s3c.c: fix no occurrence of alarm interrupt
2011-09-14 18:09:38 -07:00
s390
[S390] memory hotplug: only unassign assigned increments
2011-08-24 17:15:24 +02:00
sbus
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
scsi
scsi: fix qla2xxx printk format warning
2011-09-23 16:02:33 -07:00
sfi
…
sh
Merge branch 'common/core' into sh-latest
2011-08-08 16:33:54 +09:00
sn
…
spi
spi: Fix WARN when removing spi-fsl-spi module
2011-09-23 17:28:29 -06:00
ssb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-07-25 13:56:39 -07:00
staging
staging: zcache: fix cleancache crash
2011-09-20 14:17:13 -07:00
target
iscsi-target: Fix sendpage breakage with proper padding+DataDigest iovec offsets
2011-09-16 23:47:07 +00:00
tc
…
telephony
…
thermal
thermal: make THERMAL_HWMON implementation fully internal
2011-08-02 14:51:57 -04:00
tty
cris: fix a build error in drivers/tty/serial/crisv10.c
2011-09-14 18:09:38 -07:00
uio
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2011-07-25 23:06:24 -07:00
usb
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
uwb
uwb: Fix misspelling of neighbourhood in comment
2011-07-21 14:03:41 +02:00
vhost
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
video
backlight: Declare backlight_types[] const
2011-09-10 14:00:02 -07:00
virt
drivers/virt: add missing linux/interrupt.h to fsl_hypervisor.c
2011-07-22 09:24:39 -05:00
virtio
virtio: expose for non-virtualization users too
2011-07-23 16:20:30 +09:30
vlynq
…
w1
MAINTAINERS: Evgeniy has moved
2011-08-25 16:25:33 -07:00
watchdog
watchdog: Initconst section fixes for watchdog
2011-09-20 14:32:00 +02:00
xen
xen/irq: Alter the locking to use a mutex instead of a spinlock.
2011-09-15 04:32:02 -04:00
zorro
zorro: Defer device_register() until all devices have been identified
2011-09-22 12:59:35 -07:00
Kconfig
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2011-07-25 22:59:39 -07:00
Makefile
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2011-07-25 22:59:39 -07:00