diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-14 19:03:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-14 19:03:27 -0700 |
commit | e38f5b745075828ac51b12c8c95c85a7be4a3ec7 (patch) | |
tree | 603387de83d221f62be764de28a841ef84105413 /arch/parisc/include/asm/mc146818rtc.h | |
parent | e6d28318344535331d9473548b210dd267fe7b7e (diff) | |
parent | 8d50de9ee77b38a239dc5b1d6a63ad92a78f119d (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: SMP: fix cache flush loop
Blackfin: time-ts: ack gptimer sooner to avoid missing short ints
Blackfin: gptimers: fix thinko when disabling timers
Blackfin: SMP: make all barriers handle cache issues
Diffstat (limited to 'arch/parisc/include/asm/mc146818rtc.h')
0 files changed, 0 insertions, 0 deletions