diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-09 18:11:28 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-09 18:11:28 -0800 |
commit | a8f76842142890883f46b8e7f57f87cf224a832a (patch) | |
tree | bbc829912f06fc6693d5e8bed29c4afbd14a6ce5 /include/linux/spi/sh_hspi.h | |
parent | c93ecedab35f5305542a9fe5cfbd37377189589e (diff) | |
parent | 0e1540208ef34a2246822fa56f751efe23748e7a (diff) |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 SoC updates from Ingo Molnar:
"Various Intel Atom SoC updates (mostly to enhance debuggability), plus
an apb_timer cleanup"
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: pmc_atom: Expose contents of PSS
x86: pmc_atom: Clean up init function
x86: pmc-atom: Remove unused macro
x86: pmc_atom: don%27t check for NULL twice
x86: pmc-atom: Assign debugfs node as soon as possible
x86/platform: Remove unused function from apb_timer.c
Diffstat (limited to 'include/linux/spi/sh_hspi.h')
0 files changed, 0 insertions, 0 deletions