Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Browse source

Pull powerpc fixes from Ben Herrenschmidt:
 "Here are a couple of small powerpc fixes.  They aren't new bugs (and
  they are both CCed to stable) but I didn't see the point of sitting on
  the fixes any longer."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Add missing NULL terminator to avoid boot panic on PPC40x
  powerpc/vdso: Remove redundant locking in update_vsyscall_tz()

...

This commit is contained in:

Linus Torvalds 2013-01-03 11:37:49 -08:00

parent 062fe95afe e6449c9b2d

commit 22f4f7b59a

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

5

arch/powerpc/kernel/time.c

View file

3

arch/powerpc/platforms/40x/ppc40x_simple.c

View file