diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-09-04 15:07:35 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-04 15:07:35 +0200 |
| commit | 3fbb96d275989c604b343b9e39aeea50386756e9 (patch) | |
| tree | 6a066ece039f798f7d5a6b44453fc889e0e1cf8a /tools/perf/scripts/python | |
| parent | Merge branch 'u300-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci (diff) | |
| download | linux-3fbb96d275989c604b343b9e39aeea50386756e9.tar.gz linux-3fbb96d275989c604b343b9e39aeea50386756e9.zip | |
Merge branch 'cleanup/io-pci' into next/cleanup
The io-pci series has gained a merge to resolve a nontrivial
conflict.
* cleanup/io-pci:
ARM: Fix ioremap() of address zero
Also includes an update to Linux 3.6-rc3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions