tree 78ed04467e3bd034eaa9696cdf8d668ba7e16381
parent cbfee34520666862f8ff539e580c48958fbb7706
parent 3ea335100014785fd2518461705654b200e58d00
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1192636830 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1192636830 -0700

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
  Remove magic macros for screen_info structure members
  [x86] remove uses of magic macros for boot_params access