diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-19 14:47:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-19 14:47:11 -0700 |
| commit | 5c7c3361d177120a9980971380b52f84c2d9c97d (patch) | |
| tree | 8ad68649054d666cae56cd222dd5a5e3427207c9 /arch/mips/kernel/watch.c | |
| parent | e7489622d3603b7d161b484dcd340d9f678b0c7a (diff) | |
| parent | f58b20bd6bad48d6fc5633f003c3651115273fb2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"Just some minor fixups, a sunsu console setup panic cure, and
recognition of a Fujitsu sun4v cpu."
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: remove unused "config BITS"
sparc: delete "if !ULTRA_HAS_POPULATION_COUNT"
sparc64: correctly recognize SPARC64-X chips
sparc,leon: fix GRPCI2 device0 PCI config space access
sunsu: Fix panic in case of nonexistent port at "console=ttySY" cmdline option
Diffstat (limited to 'arch/mips/kernel/watch.c')
0 files changed, 0 insertions, 0 deletions