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

Browse source

Pull x86 core platform updates from Ingo Molnar:
 "Intel Quark and Geode SoC platform updates"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/intel/quark: Drop IMR lock bit support
  x86/platform/intel/mid: Remove dead code
  x86/platform: Make platform/geode/net5501.c explicitly non-modular
  x86/platform: Make platform/geode/alix.c explicitly non-modular
  x86/platform: Make platform/geode/geos.c explicitly non-modular
  x86/platform: Make platform/intel-quark/imr_selftest.c explicitly non-modular
  x86/platform: Make platform/intel-quark/imr.c explicitly non-modular

...

This commit is contained in:

Linus Torvalds 2016-03-15 11:20:44 -07:00

parent 13c76ad872 c637fa5294

commit 8ab84ef699

8 changed files with 29 additions and 102 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/x86/include/asm/imr.h

View file

14

arch/x86/platform/geode/alix.c

View file

8

arch/x86/platform/geode/geos.c

View file

8

arch/x86/platform/geode/net5501.c

View file

5

arch/x86/platform/intel-mid/mfld.c

View file

5

arch/x86/platform/intel-mid/mrfl.c

View file

59

arch/x86/platform/intel-quark/imr.c

View file

30

arch/x86/platform/intel-quark/imr_selftest.c

View file