forked from luck/tmp_suning_uos_patched
4964e0664c
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)
MIPS: Delete unused function add_temporary_entry.
MIPS: Set default pci cache line size.
MIPS: Flush huge TLB
MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.
MIPS: Octeon: Add support for OCTEON II PCIe
MIPS: Octeon: Update PCI Latency timer and enable more error reporting.
MIPS: Alchemy: Update cpu-feature-overrides
MIPS: Alchemy: db1200: Improve PB1200 detection.
MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
MIPS: Alchemy: irq: register pm at irq init time
MIPS: Alchemy: Touchscreen support on DB1100
MIPS: Alchemy: Hook up IrDA on DB1000/DB1100
net/irda: convert au1k_ir to platform driver.
MIPS: Alchemy: remove unused board headers
MTD: nand: make au1550nd.c a platform_driver
MIPS: Netlogic: Mark Netlogic chips as SMT capable
MIPS: Netlogic: Add support for XLP 3XX cores
MIPS: Netlogic: Merge some of XLR/XLP wakup code
MIPS: Netlogic: Add default XLP config.
...
Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,
traps.c} and drivers/tty/serial/Makefile
|
||
|---|---|---|
| .. | ||
| aty | ||
| backlight | ||
| console | ||
| display | ||
| geode | ||
| i810 | ||
| intelfb | ||
| kyro | ||
| logo | ||
| matrox | ||
| mb862xx | ||
| mbx | ||
| msm | ||
| nvidia | ||
| omap | ||
| omap2 | ||
| pnx4008 | ||
| riva | ||
| savage | ||
| sis | ||
| vermilion | ||
| via | ||
| 68328fb.c | ||
| acornfb.c | ||
| acornfb.h | ||
| amba-clcd.c | ||
| amifb.c | ||
| arcfb.c | ||
| arkfb.c | ||
| asiliantfb.c | ||
| atafb_iplan2p2.c | ||
| atafb_iplan2p4.c | ||
| atafb_iplan2p8.c | ||
| atafb_mfb.c | ||
| atafb_utils.h | ||
| atafb.c | ||
| atafb.h | ||
| atmel_lcdfb.c | ||
| au1100fb.c | ||
| au1100fb.h | ||
| au1200fb.c | ||
| au1200fb.h | ||
| bf54x-lq043fb.c | ||
| bf537-lq035.c | ||
| bfin_adv7393fb.c | ||
| bfin_adv7393fb.h | ||
| bfin-lq035q1-fb.c | ||
| bfin-t350mcqb-fb.c | ||
| broadsheetfb.c | ||
| bt431.h | ||
| bt455.h | ||
| bw2.c | ||
| c2p_core.h | ||
| c2p_iplan2.c | ||
| c2p_planar.c | ||
| c2p.h | ||
| carminefb_regs.h | ||
| carminefb.c | ||
| carminefb.h | ||
| cfbcopyarea.c | ||
| cfbfillrect.c | ||
| cfbimgblt.c | ||
| cg3.c | ||
| cg6.c | ||
| cg14.c | ||
| chipsfb.c | ||
| cirrusfb.c | ||
| clps711xfb.c | ||
| cobalt_lcdfb.c | ||
| controlfb.c | ||
| controlfb.h | ||
| cyber2000fb.c | ||
| cyber2000fb.h | ||
| da8xx-fb.c | ||
| dnfb.c | ||
| edid.h | ||
| efifb.c | ||
| ep93xx-fb.c | ||
| epson1355fb.c | ||
| fb_ddc.c | ||
| fb_defio.c | ||
| fb_draw.h | ||
| fb_notify.c | ||
| fb_sys_fops.c | ||
| fb-puv3.c | ||
| fbcmap.c | ||
| fbcvt.c | ||
| fbmem.c | ||
| fbmon.c | ||
| fbsysfs.c | ||
| ffb.c | ||
| fm2fb.c | ||
| fsl-diu-fb.c | ||
| g364fb.c | ||
| gbefb.c | ||
| grvga.c | ||
| gxt4500.c | ||
| hecubafb.c | ||
| hgafb.c | ||
| hitfb.c | ||
| hpfb.c | ||
| igafb.c | ||
| imsttfb.c | ||
| imxfb.c | ||
| jz4740_fb.c | ||
| Kconfig | ||
| leo.c | ||
| macfb.c | ||
| macmodes.c | ||
| macmodes.h | ||
| Makefile | ||
| maxinefb.c | ||
| metronomefb.c | ||
| modedb.c | ||
| mx3fb.c | ||
| mxsfb.c | ||
| n411.c | ||
| neofb.c | ||
| nuc900fb.c | ||
| nuc900fb.h | ||
| offb.c | ||
| output.c | ||
| p9100.c | ||
| platinumfb.c | ||
| platinumfb.h | ||
| pm2fb.c | ||
| pm3fb.c | ||
| pmag-aa-fb.c | ||
| pmag-ba-fb.c | ||
| pmagb-b-fb.c | ||
| ps3fb.c | ||
| pvr2fb.c | ||
| pxa3xx-gcu.c | ||
| pxa3xx-gcu.h | ||
| pxa168fb.c | ||
| pxa168fb.h | ||
| pxafb.c | ||
| pxafb.h | ||
| q40fb.c | ||
| s1d13xxxfb.c | ||
| s3c-fb.c | ||
| s3c2410fb.c | ||
| s3c2410fb.h | ||
| s3fb.c | ||
| sa1100fb.c | ||
| sa1100fb.h | ||
| sbuslib.c | ||
| sbuslib.h | ||
| sgivwfb.c | ||
| sh_mipi_dsi.c | ||
| sh_mobile_hdmi.c | ||
| sh_mobile_lcdcfb.c | ||
| sh_mobile_lcdcfb.h | ||
| sh_mobile_meram.c | ||
| sh7760fb.c | ||
| skeletonfb.c | ||
| sm501fb.c | ||
| smscufx.c | ||
| sstfb.c | ||
| sticore.h | ||
| stifb.c | ||
| sunxvr500.c | ||
| sunxvr1000.c | ||
| sunxvr2500.c | ||
| svgalib.c | ||
| syscopyarea.c | ||
| sysfillrect.c | ||
| sysimgblt.c | ||
| tcx.c | ||
| tdfxfb.c | ||
| tgafb.c | ||
| tmiofb.c | ||
| tridentfb.c | ||
| udlfb.c | ||
| uvesafb.c | ||
| valkyriefb.c | ||
| valkyriefb.h | ||
| vesafb.c | ||
| vfb.c | ||
| vga16fb.c | ||
| vgastate.c | ||
| vt8500lcdfb.c | ||
| vt8500lcdfb.h | ||
| vt8623fb.c | ||
| w100fb.c | ||
| w100fb.h | ||
| wm8505fb_regs.h | ||
| wm8505fb.c | ||
| wmt_ge_rops.c | ||
| wmt_ge_rops.h | ||
| xen-fbfront.c | ||
| xilinxfb.c | ||