diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-10 17:16:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-10 17:16:32 -0700 |
| commit | 2bfc60dd2869745f5bbed9583c517cc76e3db924 (patch) | |
| tree | 026fb79e04649790e0481d194ed774c5d5efc3d2 /tools/perf/scripts/python/net_dropmonitor.py | |
| parent | f5278565be81c9dccc10dc83d99f690f572b4fa7 (diff) | |
| parent | 80524e933658077842271fbf34e6861c41095a32 (diff) | |
Merge tag 'misc-for-linus-4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull misc fixes from Guenter Roeck:
"There are two patches here. One fixes a build error affecting the
blackfin architecture, the other fixes a build error affecting the
score architecture.
The score maintainer (Lennox Wu) has a hard time sending you the score
patch, and the blackfin maintainer (Steven Miao) has been silent since
-rc1. Since 4.1 is about to be released, I figured it would be useful
to get the patches upstream to avoid the related build failures in the
final release"
* tag 'misc-for-linus-4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
score: Fix exception handler label
blackfin: Fix build error
Diffstat (limited to 'tools/perf/scripts/python/net_dropmonitor.py')
0 files changed, 0 insertions, 0 deletions