Merge with latest Linus' tree, as I have incoming patches that fix code that is newer than current HEAD of for-next. Conflicts: drivers/net/ethernet/realtek/r8169.c |
||
|---|---|---|
| .. | ||
| ARM-gcc.h | ||
| ChangeLog | ||
| double_cpdo.c | ||
| entry.S | ||
| extended_cpdo.c | ||
| fpa11.c | ||
| fpa11.h | ||
| fpa11.inl | ||
| fpa11_cpdo.c | ||
| fpa11_cpdt.c | ||
| fpa11_cprt.c | ||
| fpmodule.c | ||
| fpmodule.h | ||
| fpmodule.inl | ||
| fpopcode.c | ||
| fpopcode.h | ||
| fpsr.h | ||
| Makefile | ||
| milieu.h | ||
| single_cpdo.c | ||
| softfloat-macros | ||
| softfloat-specialize | ||
| softfloat.c | ||
| softfloat.h | ||