« back to all changes in this revision
Viewing changes to arch/mips/include/uapi/asm/socket.h
- Committer: Package Import Robot
- Date: 2014-02-02 16:57:49 UTC
- mfrom: (1.1.10) (0.1.21 sid)
- Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Merge changes from sid up to 3.12.6-3
- include/dt-bindings/mfd
- include/linux/gpio
- include/linux/phy
- tools/perf/arch/arm/include
- tools/perf/config/feature-checks
- tools/thermal
- tools/thermal/tmon
- files removed:
- .pc/perf-fix-numa-types.patch
- .pc/perf-fix-numa-types.patch/tools
- .pc/perf-fix-numa-types.patch/tools/perf
- .pc/perf-fix-numa-types.patch/tools/perf/bench
- arch/h8300
- arch/h8300/include
- arch/h8300/include/asm
- arch/h8300/include/uapi
- arch/h8300/include/uapi/asm
- arch/mips/include/asm/mach-powertv
- files modified:
- .pc/applied-patches
added
removed
arch/mips/include/uapi/asm/socket.h
