Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Dec 2008 23:53:41 +0000 (15:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Dec 2008 23:53:41 +0000 (15:53 -0800)
commit5d279dcf98350ac3cbfa43c6aa62f4305408f2df
tree8e0ebc011403ba2fa9bebe79970618f7bd89f892
parente2e29831cc463f4be61d4e36b8699ae7e071a685
parentae4e1434a03207661b4331ea715d3f18cb479123
Merge branch 'for-linus' of git://git./linux/kernel/git/geert/linux-m68k

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Update defconfigs for 2.6.28-rc7
  macfb: Do not overflow fb_fix_screeninfo.id