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)
commit2926328554fa740518e2a6585b2cefb01e5f65f3
tree618858b51e4229480c4aaef80d166626429f0f19
parent541ef5cbb8e68189d47272cea52a69abc30259bc
parent8587b33f4adee4e7614ea7f443346c3b6bb5427a
Merge git://git./linux/kernel/git/wim/linux-2.6-nvram

* 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