summaryrefslogtreecommitdiffstats
path: root/drivers/video/clps711xfb.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-12 11:32:17 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-12 11:32:17 +0200
commit206855c321adee56db3946ca09a5887cddb9d598 (patch)
tree13a2729d4d0e37170552bd9ad3c6bba71ba0c55c /drivers/video/clps711xfb.c
parentsignals: demultiplexing SIGTRAP signal, fix (diff)
parentx86: fix early panic on amd64 due to typo in supported CPU section (diff)
downloadlinux-206855c321adee56db3946ca09a5887cddb9d598.tar.xz
linux-206855c321adee56db3946ca09a5887cddb9d598.zip
Merge branch 'x86/urgent' into core/signal
Conflicts: arch/x86/kernel/signal_64.c
Diffstat (limited to 'drivers/video/clps711xfb.c')
0 files changed, 0 insertions, 0 deletions