Anton Vorontsov e6db06a53b Merge with upstream to accommodate with thermal changes ... This merge is performed to take commit c56f5c0342 ("Thermal: Make Thermal trip points writeable") out of Linus' tree and then fixup power supply class. This is needed since thermal stuff added a new argument: CC drivers/power/power_supply_core.o drivers/power/power_supply_core.c: In function ‘psy_register_thermal’: drivers/power/power_supply_core.c:204:6: warning: passing argument 3 of ‘thermal_zone_device_register’ makes integer from pointer without a cast [enabled by default] include/linux/thermal.h:154:29: note: expected ‘int’ but argument is of type ‘struct power_supply *’ drivers/power/power_supply_core.c:204:6: error: too few arguments to function ‘thermal_zone_device_register’ include/linux/thermal.h:154:29: note: declared here make[1]: *** [drivers/power/power_supply_core.o] Error 1 make: *** [drivers/power/] Error 2 Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>		2012-07-31 05:16:47 -07:00
..
acpi	ACPI: fix acpi_bus.h build warnings when ACPI is not enabled	2012-06-04 00:29:11 -04:00
asm-generic	mm: cma: fix condition check when setting global cma area	2012-07-06 12:02:04 +02:00
crypto
drm	drm: drop comment about this header being autogenerated.	2012-06-22 11:04:55 +01:00
keys
linux	Merge with upstream to accommodate with thermal changes	2012-07-31 05:16:47 -07:00
math-emu
media
memory
misc
mtd
net	ipvs: fix oops on NAT reply in br_nf context	2012-07-17 12:00:46 +02:00
pcmcia
rdma
rxrpc
scsi	[SCSI] libsas: fix taskfile corruption in sas_ata_qc_fill_rtf	2012-07-08 09:49:14 +01:00
sound	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-06-25 14:53:09 -07:00
target	target: Add TFO->put_session() caller for HW fabric session shutdown	2012-06-12 19:33:05 -07:00
trace	rcu: Update RCU_FAST_NO_HZ tracing for lazy callbacks	2012-06-06 20:43:27 -07:00
video	fbdev updates for 3.5	2012-06-01 16:57:51 -07:00
xen
Kbuild