Conflicts: drivers/devfreq/exynos4_bus.c Sync with Linus' tree to be able to apply patches that are against newer code (mvneta). |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| caif_dev.c | ||
| caif_socket.c | ||
| caif_usb.c | ||
| cfcnfg.c | ||
| cfctrl.c | ||
| cfdbgl.c | ||
| cfdgml.c | ||
| cffrml.c | ||
| cfmuxl.c | ||
| cfpkt_skbuff.c | ||
| cfrfml.c | ||
| cfserl.c | ||
| cfsrvl.c | ||
| cfutill.c | ||
| cfveil.c | ||
| cfvidl.c | ||
| chnl_net.c | ||