]> Pileus Git - ~andy/linux/commitdiff
projects / ~andy / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6360dd 67c1b8c)
Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux...
authorThomas Gleixner <tglx@linutronix.de>
Tue, 12 Apr 2011 23:54:09 +0000 (01:54 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 12 Apr 2011 23:54:09 +0000 (01:54 +0200)
1  2 
drivers/rtc/interface.c patch | diff1 | diff2 | blob | history
drivers/rtc/rtc-bfin.c patch | diff1 | diff2 | blob | history

diff --cc drivers/rtc/interface.c
Simple merge
diff --cc drivers/rtc/rtc-bfin.c
Simple merge
Andy's Linux Kernel repo