summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-22 21:39:58 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-22 21:39:58 +0200
commit71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14 (patch)
tree8ee9f7da07bb9461a41a8ded6f9da243db02b279 /drivers/net
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jej... (diff)
parentviafb: Automatic OLPC XO-1.5 configuration (diff)
downloadlinux-71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14.tar.xz
linux-71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14.zip
Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6
* 'viafb-next' of git://github.com/schandinat/linux-2.6: (24 commits) viafb: Automatic OLPC XO-1.5 configuration viafb: remove unused CEA mode viafb: try to map less memory in case of failure viafb: use write combining for video ram viafb: add X server compatibility mode viafb: reduce OLPC refresh a bit viafb: fix OLPC XO 1.5 device connection viafb: fix OLPC DCON refresh rate viafb: delete clock and PLL initialization viafb: replace custom return values viafb: some small cleanup for global variables viafb: gather common good, old VGA initialization in one place viafb: add engine clock support viafb: add VIA slapping capability viafb: split clock and PLL code to an extra file viafb: add primary/secondary clock on/off switches viafb: add clock source selection and PLL power management support viafb: prepare for PLL separation viafb: call viafb_get_clk_value only in viafb_set_vclock viafb: remove unused max_hres/vres ...
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions