leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
489de30259
linux/drivers/rtc
History
Linus Torvalds 489de30259 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (209 commits)
  [POWERPC] Create add_rtc() function to enable the RTC CMOS driver
  [POWERPC] Add H_ILLAN_ATTRIBUTES hcall number
  [POWERPC] xilinxfb: Parameterize xilinxfb platform device registration
  [POWERPC] Oprofile support for Power 5++
  [POWERPC] Enable arbitary speed tty ioctls and split input/output speed
  [POWERPC] Make drivers/char/hvc_console.c:khvcd() static
  [POWERPC] Remove dead code for preventing pread() and pwrite() calls
  [POWERPC] Remove unnecessary #undef printk from prom.c
  [POWERPC] Fix typo in Ebony default DTS
  [POWERPC] Check for NULL ppc_md.init_IRQ() before calling
  [POWERPC] Remove extra return statement
  [POWERPC] pasemi: Don't auto-select CONFIG_EMBEDDED
  [POWERPC] pasemi: Rename platform
  [POWERPC] arch/powerpc/kernel/sysfs.c: Move NUMA exports
  [POWERPC] Add __read_mostly support for powerpc
  [POWERPC] Modify sched_clock() to make CONFIG_PRINTK_TIME more sane
  [POWERPC] Create a dummy zImage if no valid platform has been selected
  [POWERPC] PS3: Bootwrapper support.
  [POWERPC] powermac i2c: Use mutex
  [POWERPC] Schedule removal of arch/ppc
  ...

Fixed up conflicts manually in:

	Documentation/feature-removal-schedule.txt
	arch/powerpc/kernel/pci_32.c
	arch/powerpc/kernel/pci_64.c
	include/asm-powerpc/pci.h

and asked the powerpc people to double-check the result..
2007-07-16 17:58:08 -07:00
..
class.c rtc: update to class device removal patches 2007-05-08 11:15:18 -07:00
hctosys.c rtc: remove rest of class_device 2007-05-08 11:15:18 -07:00
interface.c rtc: remove "RTC_ALM_SET mode" bugs 2007-05-08 11:15:19 -07:00
Kconfig [POWERPC] Fix drivers/rtc/Kconfig for powerpc 2007-07-10 21:53:43 +10:00
Makefile rtc: simplified /proc/driver/rtc handling 2007-05-08 11:15:18 -07:00
rtc-at91rm9200.c rtc: suspend()/resume() restores system clock 2007-05-08 11:15:18 -07:00
rtc-bfin.c Blackfin: on-chip RTC controller driver 2007-05-07 12:12:58 -07:00
rtc-cmos.c RTC: use fallback IRQ if PNP tables don't provide one 2007-06-01 08:18:29 -07:00
rtc-core.h rtc: update to class device removal patches 2007-05-08 11:15:18 -07:00
rtc-dev.c rtc: remove "RTC_ALM_SET mode" bugs 2007-05-08 11:15:19 -07:00
rtc-ds1307.c [PATCH] RTC: build fixes 2006-10-04 08:15:14 -07:00
rtc-ds1553.c sysfs: add parameter "struct bin_attribute *" in .read/.write methods for sysfs binary attributes 2007-07-11 16:09:09 -07:00
rtc-ds1672.c i2c: Stop using i2c_adapter.class_dev 2007-02-13 22:09:04 +01:00
rtc-ds1742.c sysfs: add parameter "struct bin_attribute *" in .read/.write methods for sysfs binary attributes 2007-07-11 16:09:09 -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 revert "rtc: Add rtc_merge_alarm()" 2007-05-08 11:15:18 -07:00
rtc-m48t86.c [PATCH] constify rtc_class_ops: update drivers 2006-10-01 00:39:25 -07:00
rtc-max6900.c rtc: add RTC class driver for the Maxim MAX6900 2007-05-08 11:15:03 -07:00
rtc-max6902.c [PATCH] rtc-max6902: month conversion fix 2006-10-17 08:18:44 -07:00
rtc-omap.c rtc-omap build fix 2007-05-17 05:23:05 -07:00
rtc-pcf8563.c i2c: Stop using i2c_adapter.class_dev 2007-02-13 22:09:04 +01:00
rtc-pcf8583.c [ARM] rtc-pcf8583: Final fixes for this RTC on RiscPC 2007-03-04 20:33:07 +00:00
rtc-pl031.c rtc: rtc interfaces don't use class_device 2007-05-08 11:15:18 -07:00
rtc-proc.c rtc: remove rest of class_device 2007-05-08 11:15:18 -07:00
rtc-rs5c313.c rtc-rs5c313.c: add error handling to avoid hardware hangup 2007-05-11 08:29:35 -07:00
rtc-rs5c348.c [PATCH] constify rtc_class_ops: update drivers 2006-10-01 00:39:25 -07:00
rtc-rs5c372.c i2c: Stop using i2c_adapter.class_dev 2007-02-13 22:09:04 +01:00
rtc-s3c.c rtc: suspend()/resume() restores system clock 2007-05-08 11:15:18 -07:00
rtc-sa1100.c rtc: rtc interfaces don't use class_device 2007-05-08 11:15:18 -07:00
rtc-sh.c rtc: rtc-sh: Fix rtc_dev pointer for rtc_update_irq(). 2007-05-09 12:37:53 +09:00
rtc-sysfs.c rtc: remove rest of class_device 2007-05-08 11:15:18 -07:00
rtc-test.c rtc: rtc interfaces don't use class_device 2007-05-08 11:15:18 -07: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 [MIPS] separate platform_device registration for VR41xx RTC 2007-07-12 17:41:15 +01:00
rtc-x1205.c i2c: Delete outdated x1205 driver documentation 2007-07-12 14:12:28 +02:00