git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/mmc/host/sdhci-of-esdhc.c

]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/mmc/host/sdhci-of-esdhc.c

author	Linus Torvalds <torvalds@linux-foundation.org>
	Tue, 11 Jan 2011 19:06:41 +0000 (11:06 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Tue, 11 Jan 2011 19:06:41 +0000 (11:06 -0800)
commit	5943a268002fce97885f2ca08827ff1b0312068c
tree	5e304e79b68263e799224ebb1a08ead474ab299b	tree \| snapshot
parent	42776163e13a56ea3096edff7a5df95408e80eb4	commit \| diff
parent	96c8f06a0fb359a9a89701a7afab6d837e466ab0	commit \| diff

Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  rtc: Namespace fixup
  RTC: Remove UIE emulation
  RTC: Rework RTC code to use timerqueue for events

Fix up trivial conflict in drivers/rtc/rtc-dev.c

drivers/rtc/class.c

diff1 |

diff2 |

blob | history

Linux for Marvell Sheeva based platforms

RSS Atom