1
0
Fork 0
alistair23-linux/arch/arm/mach-mmp
Linus Torvalds 7c2db36e73 Merge branch 'akpm' (incoming from Andrew)
Merge misc patches from Andrew Morton:

 - Florian has vanished so I appear to have become fbdev maintainer
   again :(

 - Joel and Mark are distracted to welcome to the new OCFS2 maintainer

 - The backlight queue

 - Small core kernel changes

 - lib/ updates

 - The rtc queue

 - Various random bits

* akpm: (164 commits)
  rtc: rtc-davinci: use devm_*() functions
  rtc: rtc-max8997: use devm_request_threaded_irq()
  rtc: rtc-max8907: use devm_request_threaded_irq()
  rtc: rtc-da9052: use devm_request_threaded_irq()
  rtc: rtc-wm831x: use devm_request_threaded_irq()
  rtc: rtc-tps80031: use devm_request_threaded_irq()
  rtc: rtc-lp8788: use devm_request_threaded_irq()
  rtc: rtc-coh901331: use devm_clk_get()
  rtc: rtc-vt8500: use devm_*() functions
  rtc: rtc-tps6586x: use devm_request_threaded_irq()
  rtc: rtc-imxdi: use devm_clk_get()
  rtc: rtc-cmos: use dev_warn()/dev_dbg() instead of printk()/pr_debug()
  rtc: rtc-pcf8583: use dev_warn() instead of printk()
  rtc: rtc-sun4v: use pr_warn() instead of printk()
  rtc: rtc-vr41xx: use dev_info() instead of printk()
  rtc: rtc-rs5c313: use pr_err() instead of printk()
  rtc: rtc-at91rm9200: use dev_dbg()/dev_err() instead of printk()/pr_debug()
  rtc: rtc-rs5c372: use dev_dbg()/dev_warn() instead of printk()/pr_debug()
  rtc: rtc-ds2404: use dev_err() instead of printk()
  rtc: rtc-efi: use dev_err()/dev_warn()/pr_err() instead of printk()
  ...
2013-02-21 17:38:49 -08:00
..
include/mach Merge branch 'akpm' (incoming from Andrew) 2013-02-21 17:38:49 -08:00
Kconfig ARM: mmp: select pinctrl driver 2012-11-21 13:18:04 +08:00
Makefile ARM: mmp: move mmp2 clock definition to separated file 2012-09-08 23:38:19 +08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
aspenite.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
avengers_lite.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
brownstone.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
clock-mmp2.c ARM: mmp: move mmp2 clock definition to separated file 2012-09-08 23:38:19 +08:00
clock-pxa168.c arm: mmp: move pxa168 clock definition to separated file 2012-09-08 23:37:16 +08:00
clock-pxa910.c arm: mmp: move pxa910 clock definition to separated file 2012-09-08 23:37:51 +08:00
clock.c ARM: pxa: add clk_set_rate() 2011-07-12 19:45:19 +08:00
clock.h ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
common.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
common.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
devices.c ARM: mmp: add usb host support for PXA168 2012-05-03 15:06:05 +08:00
flint.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
gplugd.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
irq.c ARM: mmp: using for_each_set_bit to simplify the code 2012-09-21 15:57:31 +08:00
jasper.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mmp-dt.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mmp2-dt.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mmp2.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
pm-mmp2.c ARM: mmp: add PM support for mmp2 2012-05-07 11:35:00 +08:00
pm-pxa910.c ARM: mmp: add pm support for pxa910 2012-05-07 11:48:37 +08:00
pxa168.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
pxa910.c Merge branch 'akpm' (incoming from Andrew) 2013-02-21 17:38:49 -08:00
sram.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
tavorevb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
teton_bga.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
time.c ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
ttc_dkb.c Merge branch 'akpm' (incoming from Andrew) 2013-02-21 17:38:49 -08:00