Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Browse source

Pull Sparc fixes from David Miller:
 "One build regression and one serial probe regression fix on sparc."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  serial/sunzilog: fix keyboard on SUN SPARCstation
  sparc: pgtable_64: change include order

...

This commit is contained in:

Linus Torvalds 2012-04-04 08:24:21 -07:00

parent 167d821520 ca6f327dfd

commit a92bc5a65c

2 changed files with 4 additions and 4 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

4

arch/sparc/include/asm/pgtable_64.h

View file

4

drivers/tty/serial/sunzilog.c

View file