kevin/linux
1
Fork 0
Code
aa8a8d6648
linux/drivers/rtc
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
class.c [PATCH] constify rtc_class_ops: update drivers 2006-10-01 00:39:25 -07:00
hctosys.c
interface.c [PATCH] rtc class locking bugfixes 2006-11-25 13:28:33 -08:00
Kconfig [PATCH] RTC class: Kconfig improvements 2006-10-01 00:39:25 -07:00
Makefile [PATCH] RTC class: Kconfig improvements 2006-10-01 00:39:25 -07:00
rtc-at91.c [PATCH] rtc class locking bugfixes 2006-11-25 13:28:33 -08:00
rtc-dev.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
rtc-ds1307.c [PATCH] RTC: build fixes 2006-10-04 08:15:14 -07:00
rtc-ds1553.c [PATCH] rtc class locking bugfixes 2006-11-25 13:28:33 -08:00
rtc-ds1672.c [PATCH] RTC: build fixes 2006-10-04 08:15:14 -07:00
rtc-ds1742.c [PATCH] RTC: rtc-ds1553, rtc-ds1742 update 2006-10-01 00:39:25 -07:00
rtc-ep93xx.c [PATCH] constify rtc_class_ops: update drivers 2006-10-01 00:39:25 -07:00
rtc-isl1208.c [PATCH] constify rtc_class_ops: update drivers 2006-10-01 00:39:25 -07:00
rtc-lib.c [PATCH] RTC class: error checks 2006-10-01 00:39:25 -07:00
rtc-m48t86.c [PATCH] constify rtc_class_ops: update drivers 2006-10-01 00:39:25 -07:00
rtc-max6902.c [PATCH] rtc-max6902: month conversion fix 2006-10-17 08:18:44 -07:00
rtc-pcf8563.c [PATCH] constify rtc_class_ops: update drivers 2006-10-01 00:39:25 -07:00
rtc-pcf8583.c [PATCH] constify rtc_class_ops: update drivers 2006-10-01 00:39:25 -07:00
rtc-pl031.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
rtc-proc.c [PATCH] constify rtc_class_ops: update drivers 2006-10-01 00:39:25 -07:00
rtc-rs5c348.c [PATCH] constify rtc_class_ops: update drivers 2006-10-01 00:39:25 -07:00
rtc-rs5c372.c [PATCH] drivers/rtc/rtc-rs5c372.c: fix a NULL dereference 2006-11-25 13:28:33 -08:00
rtc-s3c.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
rtc-sa1100.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
rtc-sh.c sh: Updates for IRQ handler changes. 2006-10-06 15:31:16 +09:00
rtc-sysfs.c [PATCH] rtc-sysfs fix 2006-10-01 10:39:01 -07:00
rtc-test.c [PATCH] rtc class locking bugfixes 2006-11-25 13:28:33 -08:00
rtc-v3020.c [PATCH] rtc: fix printk of 64-bit res on 32-bit platform 2006-10-17 08:18:47 -07:00
rtc-vr41xx.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
rtc-x1205.c [PATCH] constify rtc_class_ops: update drivers 2006-10-01 00:39:25 -07:00