diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-09-04 08:49:39 (GMT) |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-09-04 08:49:57 (GMT) |
| commit | efd15f5f4ff63f6ac5d80850686e3d2cc8c4481b (patch) | |
| tree | 40024adbe77a3d660662e639fd765097133d648c /include/linux/of_net.h | |
| parent | 6c2794a2984f4c17a58117a68703cc7640f01c5a (diff) | |
| parent | 58c59bc997d86593f0bea41845885917cf304d22 (diff) | |
| download | linux-fsl-qoriq-efd15f5f4ff63f6ac5d80850686e3d2cc8c4481b.tar.xz | |
Merge branch 'master' into for-3.12/upstream
Sync with Linus' tree to be able to apply fixup patch on top
of 9d9a04ee75 ("HID: apple: Add support for the 2013 Macbook Air")
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include/linux/of_net.h')
0 files changed, 0 insertions, 0 deletions