Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-nvram
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Dec 2008 23:12:35 +0000 (15:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Dec 2008 23:12:35 +0000 (15:12 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-nvram:
  [PATCH] nvram - convert PRINT_PROC to seq_file
  [PATCH] nvram - CodingStyle


Trivial merge