黄涛 7cd3739f32 Merge remote-tracking branch 'linux-2.6.32.y/master' into develop ... Merge Linux 2.6.32.41 Conflicts: Makefile drivers/mmc/core/core.c drivers/net/wireless/ath/ath9k/ath9k.h drivers/net/wireless/ath/ath9k/hw.c drivers/net/wireless/ath/ath9k/main.c drivers/net/wireless/ath/regd_common.h drivers/net/wireless/b43/dma.c drivers/net/wireless/b43/dma.h drivers/net/wireless/b43/sdio.c drivers/net/wireless/hostap/hostap_cs.c drivers/net/wireless/iwlwifi/iwl-5000.c drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl-helpers.h drivers/net/wireless/iwlwifi/iwl-tx.c drivers/net/wireless/libertas/cmd.c drivers/net/wireless/p54/p54pci.c drivers/net/wireless/p54/p54usb.c drivers/net/wireless/p54/txrx.c drivers/net/wireless/rt2x00/rt2400pci.c drivers/net/wireless/rt2x00/rt2500pci.c drivers/net/wireless/rt2x00/rt2500usb.c drivers/net/wireless/rt2x00/rt2800usb.c drivers/net/wireless/rt2x00/rt2x00.h drivers/net/wireless/rt2x00/rt2x00dev.c drivers/net/wireless/rt2x00/rt2x00queue.c drivers/net/wireless/rt2x00/rt61pci.c drivers/net/wireless/rt2x00/rt73usb.c drivers/usb/serial/option.c mm/shmem.c		2011-06-16 11:56:59 +08:00
..
alarm-dev.c
alarm.c	alarm: port from 2818, fix shutdown bug	2011-04-26 21:00:38 +08:00
class.c
hctosys.c
interface.c
Kconfig	cwz add tps65910 driver	2011-02-27 18:19:53 -08:00
Makefile	cwz add tps65910 driver	2011-02-27 18:19:53 -08:00
rtc-ab3100.c
rtc-at32ap700x.c
rtc-at91rm9200.c
rtc-at91sam9.c
rtc-au1xxx.c
rtc-bfin.c
rtc-bq4802.c
rtc-cmos.c	rtc-cmos: fix suspend/resume	2011-02-17 15:37:00 -08:00
rtc-coh901331.c
rtc-core.h
rtc-dev.c
rtc-dm355evm.c
rtc-ds1216.c
rtc-ds1286.c
rtc-ds1302.c
rtc-ds1305.c
rtc-ds1307.c
rtc-ds1374.c
rtc-ds1390.c
rtc-ds1511.c	drivers/rtc/rtc-ds1511.c: world-writable sysfs nvram file	2011-04-14 16:53:37 -07:00
rtc-ds1553.c
rtc-ds1672.c
rtc-ds1742.c
rtc-ds3234.c
rtc-efi.c
rtc-ep93xx.c
rtc-fm3130.c
rtc-generic.c
rtc-HYM8563.c	rtc: hym8563: work around set alarm problem and indent	2011-03-10 14:46:33 +08:00
rtc-HYM8563.h
rtc-isl1208.c
rtc-lib.c
rtc-m41t80.c
rtc-m41t94.c
rtc-m48t35.c
rtc-m48t59.c
rtc-m48t86.c
rtc-max6900.c
rtc-max6902.c
rtc-mv.c
rtc-mxc.c
rtc-omap.c
rtc-pcap.c
rtc-pcf2123.c
rtc-pcf8563.c
rtc-pcf8583.c
rtc-pcf50633.c
rtc-pl030.c
rtc-pl031.c
rtc-proc.c
rtc-ps3.c
rtc-pxa.c
rtc-r9701.c
rtc-rs5c313.c
rtc-rs5c348.c
rtc-rs5c372.c
rtc-rx8025.c
rtc-rx8581.c
rtc-s3c.c
rtc-s35390a.c
rtc-s35392a.c
rtc-s35392a.h
rtc-sa1100.c
rtc-sh.c
rtc-starfire.c
rtc-stk17ta8.c
rtc-stmp3xxx.c
rtc-sun4v.c
rtc-sysfs.c
rtc-test.c	add wm831x special operation and modify lcd and touch screen for A22	2011-04-06 10:23:41 +08:00
rtc-tps65910.c	cwz update tps65910 irq	2011-03-03 19:09:16 -08:00
rtc-twl4030.c
rtc-tx4939.c
rtc-v3020.c
rtc-vr41xx.c
rtc-wm831x.c	rtc: wm831x: init rtc when first run	2011-03-31 18:03:30 +08:00
rtc-wm8350.c
rtc-x1205.c