summaryrefslogtreecommitdiffstats
path: root/drivers/video/vgastate.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 10:56:57 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 10:56:57 -0800
commitd04ef3a795b3b7b376a02713ed5e211e9ae1f917 (patch)
tree837da034751a2fc1be0fc5a105c218d41a498eb6 /drivers/video/vgastate.c
parent36177ba655c238e33400cc2837a28720b62784bd (diff)
parentdcc1e8dd88d4bc55e32a26dad7633d20ffe606d2 (diff)
downloadop-kernel-dev-d04ef3a795b3b7b376a02713ed5e211e9ae1f917.zip
op-kernel-dev-d04ef3a795b3b7b376a02713ed5e211e9ae1f917.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Add a secondary TSB for hugepage mappings. [SPARC]: Respect vm_page_prot in io_remap_page_range().
Diffstat (limited to 'drivers/video/vgastate.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud