Linus Torvalds 56a9ccb7ba Merge git://git.infradead.org/battery-2.6 ... * git://git.infradead.org/battery-2.6: (30 commits) bq20z75: Fix time and temp units bq20z75: Fix issues with present and suspend z2_battery: Fix count of properties s3c_adc_battery: Fix method names when PM not set z2_battery: Add MODULE_DEVICE_TABLE ds2782_battery: Add MODULE_DEVICE_TABLE bq20z75: Add MODULE_DEVICE_TABLE power_supply: Update power_supply_is_watt_property bq20z75: Add i2c retry mechanism bq20z75: Add optional battery detect gpio twl4030_charger: Make the driver atomic notifier safe bq27x00: Use single i2c_transfer call for property read bq27x00: Cleanup bq27x00_i2c_read bq27x00: Minor cleanups bq27x00: Give more specific reports on battery status bq27x00: Add MODULE_DEVICE_TABLE bq27x00: Add new properties bq27x00: Poll battery state bq27x00: Cache battery registers bq27x00: Add bq27000 support ...		2011-03-25 21:00:29 -07:00
..
acpi	Merge branch 'linus' into release	2011-03-23 02:34:54 -04:00
asm-generic	Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-25 17:52:22 -07:00
crypto
drm	drm/vblank: update recently added vbl interface to be more future proof.	2011-03-24 21:28:46 +10:00
keys	RxRPC: Fix v1 keys	2011-03-02 22:18:53 -08:00
linux	Merge git://git.infradead.org/battery-2.6	2011-03-25 21:00:29 -07:00
math-emu
media	[media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t	2011-03-22 19:41:58 -03:00
mtd
net	IPVS: Use global mutex in ip_vs_app.c	2011-03-21 20:39:24 -07:00
pcmcia	pcmcia: re-enable Zoomed Video support	2011-02-20 12:47:34 +01:00
rdma	RDMA: Update workqueue usage	2011-01-16 21:16:31 -08:00
rxrpc
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-03-17 17:54:40 -07:00
sound	Merge branch 'topic/misc' into for-linus	2011-03-18 07:39:08 +01:00
staging	[media] Altera FPGA firmware download module	2011-03-21 20:32:16 -03:00
target	[SCSI] target: Fix t_transport_aborted handling in LUN_RESET + active I/O shutdown	2011-02-28 11:23:32 -06:00
trace	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4	2011-03-25 09:57:41 -07:00
video	atmel_lcdfb: implement inverted contrast pwm	2011-03-22 16:23:44 +09:00
xen	Merge branch 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-03-17 18:37:42 -07:00
Kbuild