Merge branch 'nvram' into next

Browse source

...

This commit is contained in:

Benjamin Herrenschmidt 2010-12-09 14:36:38 +11:00

parent 46f5221049 6024ede9ba

commit f4b9841595

5 changed files with 381 additions and 363 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

52

arch/powerpc/include/asm/nvram.h

View file

489

arch/powerpc/kernel/nvram_64.c

View file

2

arch/powerpc/mm/pgtable.c

View file

4

arch/powerpc/platforms/chrp/time.c

View file

205

arch/powerpc/platforms/pseries/nvram.c

View file