diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 10:34:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 10:34:47 -0700 |
| commit | 9d0715630ebf7bf70daa5e6d8db0e3061268c61e (patch) | |
| tree | 54562185002b22169d81e0fb3c21312cb510ac40 /include/linux/stmmac.h | |
| parent | c0c463d34adf0c150e5e24fa412fa23f3f7ddc27 (diff) | |
| parent | 06c3df49521c1b112b777cc4946e5de057c814ba (diff) | |
Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
clocksource: apb: Share APB timer code with other platforms
Diffstat (limited to 'include/linux/stmmac.h')
0 files changed, 0 insertions, 0 deletions