From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 17 Oct 2007 16:00:30 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux... 
X-Git-Tag: v2.6.24-rc1~493
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5c8e191e8437616a498a8e1cc0af3dd0d32bbff2;p=linux-2.6-omap-h63xx.git

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
---

5c8e191e8437616a498a8e1cc0af3dd0d32bbff2