iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
Len Brown 29b19e2504 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal 
Conflicts:
	drivers/staging/omap-thermal/omap-thermal-common.
		OMAP supplied dummy TC1 and TC2,
		at the same time that the thermal tree removed them
		from thermal_zone_device_register()

	drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
		propogate the upstream MAX_IDR_LEVEL re-name
			to prevent a build failure

	Previously-fixed-by: Stephen Rothwell <sfr@canb.auug.org.au>

Signed-off-by: Len Brown <len.brown@intel.com>
2012-10-09 01:35:52 -04:00
..
accessibility
…
acpi
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal
2012-10-09 01:35:52 -04:00
amba
…
ata
SCSI for-linus on 20121002
2012-10-02 19:01:32 -07:00
atm
sections: fix section conflicts in drivers/atm
2012-10-06 03:04:40 +09:00
auxdisplay
…
base
firmware: use 'kernel_read()' to read firmware into kernel buffer
2012-10-04 09:19:02 -07:00
bcma
bcma: change delays to follow timers-howto guide
2012-09-28 13:54:02 -04:00
block
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-10-02 11:11:09 -07:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
bus
drivers: bus: omap_l3: fixup merge conflict resolution
2012-10-01 19:39:48 -07:00
cdrom
…
char
sections: fix section conflicts in drivers/char
2012-10-06 03:04:41 +09:00
clk
spi: Updates for v3.7
2012-10-02 17:26:42 -07:00
clocksource
Power management updates for 3.7-rc1
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
Power management updates for 3.7-rc1
2012-10-02 18:32:35 -07:00
cpuidle
cpuidle: rename function name "__cpuidle_register_driver", v2
2012-09-22 00:38:32 +02:00
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2012-10-04 09:06:34 -07:00
dca
…
devfreq
…
dio
…
dma
drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma channel message
2012-10-06 03:04:36 +09:00
edac
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
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: addendum to address handler RCU conversion
2012-09-28 11:47:42 +02:00
firmware
…
gpio
So this is the LW GPIO patch stack for v3.7:
2012-10-02 16:05:10 -07:00
gpu
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-10-03 23:29:23 -07:00
hid
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
hsi
…
hv
…
hwmon
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal
2012-10-09 01:35:52 -04:00
hwspinlock
…
i2c
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
ide
sections: fix section conflicts in drivers/ide
2012-10-06 03:04:41 +09:00
idle
…
iio
iio: adc: add new lp8788 adc driver
2012-09-22 10:29:19 +01:00
infiniband
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-10-02 17:16:10 -07:00
iommu
PCI changes for the 3.7 merge window:
2012-10-01 12:05:36 -07:00
irqchip
irqchip: fill in empty Kconfig
2012-09-24 10:07:40 -07:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
leds
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
lguest
lguest, x86: handle guest TS bit for lazy/non-lazy fpu host models
2012-09-18 15:52:09 -07:00
macintosh
sections: fix section conflicts in drivers/macintosh
2012-10-06 03:04:41 +09:00
md
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
media
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
memory
memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()
2012-09-26 14:04:09 -07:00
memstick
…
message
[SCSI] Fusion MPT: disable pci device when mpt map resoures failed
2012-09-14 17:59:29 +01:00
mfd
sections: fix section conflicts in drivers/mfd
2012-10-06 03:04:42 +09:00
misc
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
mmc
sections: fix section conflicts in drivers/mmc
2012-10-06 03:04:42 +09:00
mtd
The main change is the way we reserve eraseblocks for bad blocks
2012-10-02 20:49:15 -07:00
net
drivers/net/ethernet/dec/tulip: Use standard __set_bit_le() function
2012-10-06 03:04:55 +09:00
nfc
NFC: Fix missing mutex unlock in pn533_send_cmd_frame_async
2012-09-27 10:47:48 +02:00
nubus
…
of
Devicetree updates for 3.7
2012-10-03 09:44:08 -07:00
oprofile
…
parisc
…
parport
…
pci
Features:
2012-10-02 22:09:10 -07:00
pcmcia
ARM: soc: multiplatform enablement
2012-10-01 19:11:38 -07:00
pinctrl
These are the bulk pinctrl changes for kernel v3.7:
2012-10-02 16:20:20 -07:00
platform
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal
2012-10-09 01:35:52 -04:00
pnp
…
power
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal
2012-10-09 01:35:52 -04:00
pps
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
ps3
…
ptp
ptp: link the phc device to its parent device
2012-09-22 15:42:38 -04:00
pwm
…
rapidio
Merge commit 'v3.6-rc5' into next
2012-09-13 08:41:01 -06:00
regulator
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
remoteproc
- Remoteproc Recovery - by Fernando Guzman Lugo - when a remote processor
2012-10-04 09:11:57 -07:00
rpmsg
rpmsg: fix dma_free_coherent dev parameter
2012-09-12 12:03:57 +03:00
rtc
ARM: soc: device tree updates
2012-10-01 18:28:06 -07:00
s390
SCSI for-linus on 20121002
2012-10-02 19:01:32 -07:00
sbus
drivers/sbus/char: removes unnecessary semicolon
2012-09-21 12:08:56 -07:00
scsi
sections: fix section conflicts in drivers/scsi
2012-10-06 03:04:44 +09:00
sfi
…
sh
ARM: soc: multiplatform enablement
2012-10-01 19:11:38 -07:00
sn
…
spi
Devicetree updates for 3.7
2012-10-03 09:44:08 -07:00
ssb
…
staging
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal
2012-10-09 01:35:52 -04:00
target
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-10-01 09:06:36 -07:00
tc
…
thermal
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal
2012-10-09 01:35:52 -04:00
tty
Features:
2012-10-02 22:09:10 -07:00
uio
…
usb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
uwb
…
vfio
switch simple cases of fget_light to fdget
2012-09-26 22:20:08 -04:00
vhost
vhost_set_vring(): turn pollstart/pollstop into bool
2012-09-26 21:10:12 -04:00
video
drivers/video/backlight/platform_lcd.c: add support for device tree based probe
2012-10-06 03:04:54 +09:00
virt
…
virtio
…
vlynq
…
vme
…
w1
char/misc driver merge for 3.7-rc1
2012-10-01 12:09:59 -07:00
watchdog
ARM: soc: general cleanups
2012-10-01 18:19:05 -07:00
xen
Features:
2012-10-02 22:09:10 -07:00
zorro
…
Kconfig
ARM: soc: driver specific changes
2012-10-01 18:46:13 -07:00
Makefile
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00