diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 23:49:17 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 23:49:17 +0400 |
| commit | 132452ee2368cf775ccbef9746b51e3d2ba58b85 (patch) | |
| tree | 68652e7a5d11776184e7b05c04dfc94baa429f2a /drivers/net/rionet.c | |
| parent | 174457391a83d70215d441cb3bc0aa7d7443b63e (diff) | |
| parent | 97fb85076c2d3adcc559dee577e0a3bf7215d48e (diff) | |
| download | linux-132452ee2368cf775ccbef9746b51e3d2ba58b85.tar.xz | |
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
efifb: Add override for 11" Macbook Air 3,1
efifb: Support overriding fields FW tells us with the DMI data.
fb: Reduce priority of resource conflict message
savagefb: Remove obsolete else clause in savage_setup_i2c_bus
savagefb: Set up I2C based on chip family instead of card id
savagefb: Replace magic register address with define
drivers/video/bfin-lq035q1-fb.c: introduce missing kfree
video: s3c-fb: fix checkpatch errors and warning
efifb: support AMD Radeon HD 6490
s3fb: fix Virge/GX2
fbcon: Remove unused 'display *p' variable from fb_flashcursor()
fbdev: sh_mobile_lcdcfb: fix module lock acquisition
fbdev: sh_mobile_lcdcfb: add blanking support
viafb: initialize margins correct
viafb: refresh rate bug collection
sh: mach-ap325rxa: move backlight control code
sh: mach-ecovec24: support for main lcd backlight
Diffstat (limited to 'drivers/net/rionet.c')
0 files changed, 0 insertions, 0 deletions