diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-02 15:53:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-02 15:53:41 -0800 |
| commit | 5d279dcf98350ac3cbfa43c6aa62f4305408f2df (patch) | |
| tree | 8e0ebc011403ba2fa9bebe79970618f7bd89f892 /drivers/net/bnx2x_main.c | |
| parent | e2e29831cc463f4be61d4e36b8699ae7e071a685 (diff) | |
| parent | ae4e1434a03207661b4331ea715d3f18cb479123 (diff) | |
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
Diffstat (limited to 'drivers/net/bnx2x_main.c')
0 files changed, 0 insertions, 0 deletions