tree 8e0ebc011403ba2fa9bebe79970618f7bd89f892
parent e2e29831cc463f4be61d4e36b8699ae7e071a685
parent ae4e1434a03207661b4331ea715d3f18cb479123
author Linus Torvalds <torvalds@linux-foundation.org> 1228262021 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228262021 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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