diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-02-11 15:30:47 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-11 15:32:21 -0500 |
| commit | 5d8eac3ad982ee32e3dee56626ba3d1fc577fcbc (patch) | |
| tree | 354c294c7eea0af66cd72036deff5f8c6ec6d53b /tools/perf/scripts/python/Perf-Trace-Util/lib | |
| parent | 8708aac79e4572ba673d7a21e94ddca9f3abb7fc (diff) | |
| parent | cd48d8ba149484c4723a2b75159deeb83f3d2273 (diff) | |
Merge tag 'nfc-next-3.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz <sameo@linux.intel.com> says:
"This 3rd NFC pull request for 3.9 contains a fix for the microread MEI
physical layer support, as the MEI bus API changed.
From the MEI code, we now pass the MEI id back to the driver probe routine,
and we also pass a name and a MEI id table through the mei_bus_driver
structure. A few renames as well like e.g. mei_bus_driver to mei_driver or
mei_bus_client to mei_device in order to be closer to the driver model
practices."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'tools/perf/scripts/python/Perf-Trace-Util/lib')
0 files changed, 0 insertions, 0 deletions