mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-08 03:02:31 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
ec612fcf43e09f5e05d37baf4d3f138b3fcc2f3d
linux/drivers
History
Len Brown ec612fcf43 Merge branch 'd3' into release 
Conflicts:
	drivers/acpi/sleep.c

This was a text conflict between
a2ef5c4fd4
(ACPI: Move module parameter gts and bfs to sleep.c)

which added #include <linux/module.h>

and

b24e509885
(ACPI, PCI: Move acpi_dev_run_wake() to ACPI core)

which added #include <linux/pm_runtime.h>

The resolution was to take them both.

Signed-off-by: Len Brown <len.brown@intel.com>
2012-03-30 16:21:26 -04:00
..
accessibility
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
acpi
Merge branch 'd3' into release
2012-03-30 16:21:26 -04:00
amba
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2012-01-08 13:10:57 -08:00
ata
pata/at91: use newly introduced SMC accessors
2012-02-13 18:31:37 +01:00
atm
drivers/atm/solos-pci.c: exchange pci_iounmaps
2012-02-19 18:57:51 -05:00
auxdisplay
…
base
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
2012-02-18 15:37:25 -08:00
bcma
bcma: don't fail for bad SPROM CRC
2012-02-06 14:37:52 -05:00
block
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2012-03-14 17:16:45 -07:00
bluetooth
Bluetooth: btusb: Add vendor specific ID (0a5c 21f3) for BCM20702A0
2012-02-15 13:09:26 +02:00
cdrom
cdrom: move shared static to cdrom_device_info
2012-02-08 20:03:14 +01:00
char
agp: fix scratch page cleanup
2012-01-26 18:36:48 +00:00
clk
clk: add config option HAVE_CLK_PREPARE into Kconfig
2011-12-28 21:35:06 +08:00
clocksource
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2012-01-06 18:15:25 -08:00
connector
…
cpufreq
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
2012-01-11 18:53:33 -08:00
cpuidle
cpuidle: power_usage should be declared signed integer
2012-03-30 03:23:30 -04:00
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2012-03-03 09:31:49 -08:00
dca
…
devfreq
Merge branch 'devfreq-for-next' of git://git.infradead.org/users/kmpark/linux-samsung into pm-devfreq
2011-12-21 09:51:23 +01:00
dio
…
dma
i.MX SDMA: Fix burstsize settings
2012-02-02 14:00:43 +05:30
edac
asm-generic: architecture independent readq/writeq for 32bit environment
2012-02-21 16:47:28 -08:00
eisa
…
firewire
firewire: ohci: disable MSI on Ricoh controllers
2012-01-30 21:33:34 +01:00
firmware
Merge commit '070680218379e15c1901f4bf21b98e3cbf12b527' into stable/for-linus-fixes-3.3
2012-01-12 11:53:55 -05:00
gpio
gpio: Add missing spin_lock_init in gpio-ml-ioh driver
2012-02-01 21:59:37 -07:00
gpu
Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-fixes
2012-03-15 09:41:26 +00:00
hid
HID: hid-input: allow array fields out of range
2012-03-05 10:28:58 +01:00
hv
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2012-01-09 12:09:47 -08:00
hwmon
hwmon: (zl6100) Enable interval between chip accesses for all chips
2012-03-14 09:17:03 -07:00
hwspinlock
…
i2c
i2c-algo-bit: Fix spurious SCL timeouts under heavy load
2012-03-15 18:11:05 +01:00
ide
ARM: at91: drop ide driver in favor of the pata one
2012-02-13 18:31:37 +01:00
idle
ACPI processor hotplug: Delay acpi_processor_start() call for hotplugged cores
2012-01-19 21:26:32 -05:00
ieee802154
…
infiniband
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-02-10 14:18:46 -08:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-03-07 08:31:31 -08:00
iommu
x86/amd: iommu_set_device_table() must not be __init
2012-03-08 11:36:06 +01:00
isdn
isdn: type bug in isdn_net_header()
2012-02-09 15:41:29 -05:00
leds
drivers/leds/leds-lm3530.c: fix setting pltfm->als_vmax
2012-02-08 19:03:51 -08:00
lguest
lguest: Make sure interrupt is allocated ok by lguest_setup_irq
2012-01-12 15:44:47 +10:30
macintosh
powerpc/adb: Use set_current_state()
2012-02-16 16:15:12 +11:00
mca
…
md
Merge tag 'dm-3.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm
2012-03-08 17:21:51 -08:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-03-15 17:06:05 -07:00
memstick
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
message
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2012-01-10 10:36:08 -08:00
mfd
mfd: Correct readability of WM8994 DC servo 4E register
2012-03-01 01:42:52 +01:00
misc
c2port: class_create() returns an ERR_PTR
2012-03-05 15:49:43 -08:00
mmc
mmc: core: Fixup suspend/resume issues for UHS-I cards
2012-03-04 12:25:15 -05:00
mtd
Merge tag 'for-linus-3.3' of git://git.infradead.org/~dwmw2/mtd-3.3
2012-02-04 07:17:47 -08:00
net
wimax/i2400m: fix erroneous NETDEV_TX_BUSY use
2012-03-16 02:01:41 -07:00
nfc
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
nubus
…
of
of/mdio: fix fixed link bus name
2012-02-27 10:09:52 -06:00
oprofile
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-01-06 08:02:58 -08:00
parisc
[PARISC] include <linux/prefetch.h> in drivers/parisc/iommu-helpers.h
2012-02-27 09:44:15 -06:00
parport
Merge tag 'for-linus' of git://github.com/rustyrussell/linux
2012-01-14 12:32:16 -08:00
pci
ACPI, PCI: Move acpi_dev_run_wake() to ACPI core
2012-03-30 02:21:18 -04:00
pcmcia
ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe
2012-02-16 10:41:23 +08:00
pinctrl
pinctrl: restore pin naming
2012-02-01 19:35:21 +01:00
platform
Disable MCP limit exceeded messages from Intel IPS driver
2012-03-30 16:06:12 -04:00
pnp
PNPACPI: Fix device ref leaking in acpi_pnp_match
2012-03-30 03:38:40 -04:00
power
lp8727_charger: Add terminating entry for i2c_device_id table
2012-02-01 21:34:26 +04:00
pps
pps: class_create() returns an ERR_PTR, not NULL
2012-03-05 15:49:43 -08:00
ps3
…
ptp
…
rapidio
rapidio/tsi721: fix bug in register offset definitions
2012-03-15 17:03:03 -07:00
regulator
regulator: da9052: Ensure the selected voltage falls within the specified range
2012-03-11 20:39:10 +00:00
rtc
drivers/rtc/rtc-r9701.c: fix crash in r9701_remove()
2012-03-05 15:49:43 -08:00
s390
[S390] qdio: fix handler function arguments for zfcp data router
2012-03-02 17:33:00 +01:00
sbus
…
scsi
floppy/scsi: fix setting of BIO flags
2012-03-05 15:49:43 -08:00
sfi
…
sh
sh: clkfwk: bugfix: use clk_reparent() for div6 clocks
2012-01-24 10:44:49 +09:00
sn
…
spi
Fix section mismatch in spi-pl022.c
2012-02-13 11:57:58 -07:00
ssb
ssb: fix cardbus slot in hostmode
2012-02-01 15:26:00 -05:00
staging
staging: pohmelfs: remove drivers/staging/pohmelfs
2012-02-08 16:19:06 -08:00
target
iscsi-target: Fix reservation conflict -EBUSY response handling bug
2012-03-13 21:43:58 -07:00
tc
…
telephony
…
thermal
thermal: Fix for setting the thermal zone mode to enable/disable
2012-03-22 01:10:18 -04:00
tty
sh-sci / PM: Avoid deadlocking runtime PM
2012-03-09 12:59:44 +09:00
uio
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
usb
Revert "powerpc/usb: fix issue of CPU halt when missing USB PHY clock"
2012-03-02 16:08:54 -08:00
uwb
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2012-01-09 12:09:47 -08:00
vhost
vhost-net: add module alias (v2.1)
2012-01-13 10:12:23 -08:00
video
drivers/video/backlight/s6e63m0.c: fix corruption storing gamma mode
2012-03-15 17:03:04 -07:00
virt
…
virtio
virtio: balloon: leak / fill balloon across S4
2012-03-01 09:28:41 +10:30
vlynq
…
w1
…
watchdog
watchdog: fix GETTIMEOUT ioctl in booke_wdt
2012-02-29 09:46:13 +01:00
xen
xenbus_dev: add missing error check to watch handling
2012-02-03 16:07:05 -05:00
zorro
misc latin1 to utf8 conversions
2012-01-02 13:04:55 +01:00
Kconfig
…
Makefile
mmc: sdhci-pci: add platform data
2012-01-11 23:58:47 -05:00