mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
80ae3fa5d6712ef3625eff617f72e190645d6361
linux/drivers
History
Greg Kroah-Hartman 80ae3fa5d6 Merge 2.6.38-rc5 into staging-next 
This is to resolve a merge conflict with:
	drivers/staging/zram/zram_drv.c
as pointed out by Stephen Rothwell

Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Robert Jennings <rcj@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18 12:11:27 -08:00
..
accessibility
…
acpi
Merge branch 'iomem' into release
2011-02-15 15:25:48 -05:00
amba
…
ata
libata: set queue DMA alignment to sector size for ATAPI too
2011-01-28 03:16:20 -05:00
atm
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2011-01-24 13:17:06 -08:00
auxdisplay
…
base
PM / Runtime: Don't enable interrupts while running in_interrupt
2011-01-25 20:50:07 +01:00
block
nbd: remove module-level ioctl mutex
2011-02-11 16:12:20 -08:00
bluetooth
Bluetooth: ath3k: reduce memory usage
2011-01-19 14:40:41 -02:00
cdrom
cdrom: support devices that have check_events but not media_changed
2011-02-09 14:22:37 +01:00
char
Merge branch 'for-james' of git://tpmdd.git.sourceforge.net/gitroot/tpmdd/tpmdd into for-linus
2011-02-11 17:34:47 +11:00
clk
…
clocksource
drivers/clocksource/tcb_clksrc.c: fix init sequence
2011-01-26 10:50:04 +10:00
connector
…
cpufreq
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
cpuidle
Merge branch 'cpuidle-perf-events' into idle-test
2011-01-12 18:06:19 -05:00
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2011-01-13 10:25:58 -08:00
dca
dca: remove unneeded NULL check
2011-01-13 08:03:09 -08:00
dio
…
dma
Merge branch 'imx' into dmaengine-fixes
2011-02-14 02:40:46 -08:00
edac
amd64_edac: Fix DIMMs per DCTs output
2011-02-10 14:41:49 +01:00
eisa
…
firewire
Merge branches 'fixes' and 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2011-01-21 13:34:39 -08:00
firmware
x86, dmi, debug: Log board name (when present) in dmesg/oops output
2011-02-15 04:20:57 +01:00
gpio
drivers/gpio/pca953x.c: add a mutex to fix race condition
2011-02-11 16:12:20 -08:00
gpu
drm/radeon/kms: hopefully fix pll issues for real (v3)
2011-02-15 09:18:51 +10:00
hid
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
hwmon
hwmon: (emc1403) Fix I2C address range
2011-02-09 13:45:52 -08:00
i2c
i2c: Encourage move to dev_pm_ops by warning on use of legacy methods
2011-01-14 22:03:50 +01:00
ide
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
idle
fix a shutdown regression in intel_idle
2011-01-25 05:57:34 +10:00
ieee802154
…
infiniband
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2011-02-03 11:19:26 -08:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-02-15 09:40:27 -08:00
isdn
isdn: hysdn: Kill (partially buggy) CVS regision log reporting.
2011-02-09 13:56:53 -08:00
leds
leds: leds-pwm: return proper error if pwm_request failed
2011-01-26 10:49:58 +10:00
lguest
lguest: compile fixes
2011-01-20 21:37:29 +10:30
macintosh
powerpc/macintosh: Fix wrong test in fan_{read,write}_reg()
2011-01-21 14:08:34 +11:00
mca
…
md
FIX: md: process hangs at wait_barrier after 0->10 takeover
2011-02-08 11:49:02 +11:00
media
Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2011-02-02 17:52:19 -08:00
memstick
memstick: factor out transfer initiating functionality in mspro_block.c
2011-01-13 08:03:22 -08:00
message
…
mfd
mfd: ab8500-core chip version cut 2.0 support
2011-01-14 12:38:18 +01:00
misc
misc: Make AB8500_PWM driver depend on U8500 due to PWM breakage
2011-01-14 12:38:12 +01:00
mmc
ARM: mmci: round down the bytes transferred on error
2011-01-31 10:53:37 +00:00
mtd
Revert "UBI: use mtd->writebufsize to set minimal I/O unit size"
2011-01-29 18:27:13 +02:00
net
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
2011-02-15 17:51:18 -08:00
nfc
drivers/nfc/pn544.c: fix min_t warnings
2011-01-16 17:28:21 -08:00
nubus
…
of
dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch()
2011-01-15 22:01:58 -07:00
oprofile
…
parisc
…
parport
parport: make lockdep happy with waitlist_lock
2011-01-26 10:49:59 +10:00
pci
pci: use security_capable() when checking capablities during config space read
2011-02-15 19:06:31 +11:00
pcmcia
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
2011-01-20 17:02:05 -08:00
platform
intel_scu_ipc: remove duplicated #include
2011-01-31 12:59:34 +10:00
pnp
Merge branch 'pnp' into release
2011-01-12 04:59:44 -05:00
power
Merge git://git.infradead.org/battery-2.6
2011-01-14 09:25:59 -08:00
pps
pps: claim parallel port exclusively
2011-01-26 10:50:00 +10:00
ps3
…
rapidio
rapidio: fix new kernel-doc warnings
2011-01-22 20:32:37 -08:00
regulator
regulator: Support MAX8998/LP3974 DVS-GPIO
2011-01-14 12:38:16 +01:00
rtc
Merge branch 'rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-02-14 10:10:07 -08:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2011-02-04 13:20:01 -08:00
sbus
…
scsi
[SCSI] libsas: fix runaway error handler problem
2011-01-24 11:52:33 -06:00
sfi
SFI: use ioremap_cache() instead of ioremap()
2011-01-11 23:27:25 -05:00
sh
sh: update INTC to clear IRQ sense valid flag
2011-01-19 19:02:35 +09:00
sn
…
spi
spi/spi_sh_msiof: fix wrong address calculation, which leads to an Oops
2011-01-21 09:26:24 -07:00
ssb
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2011-02-08 12:03:54 -08:00
staging
Merge 2.6.38-rc5 into staging-next
2011-02-18 12:11:27 -08:00
target
[SCSI] target: Add LIO target core v4.0.0-rc6
2011-01-14 10:12:29 -06:00
tc
…
telephony
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
thermal
Merge branch 'misc' into release
2011-01-12 05:14:15 -05:00
tty
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
2011-02-15 17:51:18 -08:00
uio
…
usb
USB: cdc-acm: Adding second ACM channel support for Nokia N8
2011-02-04 12:38:14 -08:00
uwb
…
vhost
vhost: rcu annotation fixup
2011-02-01 16:48:46 +02:00
video
console: rename acquire/release_console_sem() to console_lock/unlock()
2011-01-26 10:50:06 +10:00
virtio
virtio: remove virtio-pci root device
2011-01-20 21:37:30 +10:30
vlynq
…
w1
drivers/w1/masters/omap_hdq.c: add missing clk_put
2011-02-11 16:12:20 -08:00
watchdog
m68knommu: Rename m548x_wdt.c to m54xx_wdt.c
2011-02-08 15:07:45 +10:00
xen
Merge branch 'xen/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
2011-01-20 16:37:28 -08:00
zorro
…
Kconfig
[SCSI] target: Add LIO target core v4.0.0-rc6
2011-01-14 10:12:29 -06:00
Makefile
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2011-01-20 16:39:23 -08:00