diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-07-16 23:57:38 +0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-07-16 23:57:38 +0400 |
| commit | afdb094380889222583df9ef803587f6b8a82c8d (patch) | |
| tree | 4a03c516568e5c8b994a5739f3d34f4552c78898 /scripts/recordmcount.c | |
| parent | be11e6d86081aa6328eaa4fe6dd14ccf39a023c8 (diff) | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
| download | linux-afdb094380889222583df9ef803587f6b8a82c8d.tar.xz | |
Merge tag 'v3.16-rc5' into timers/core
Reason: Bring in upstream modifications, so the pending changes which
depend on them can be queued.
Diffstat (limited to 'scripts/recordmcount.c')
| -rw-r--r-- | scripts/recordmcount.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c index e11aa4a156d2..650ecc83d7d7 100644 --- a/scripts/recordmcount.c +++ b/scripts/recordmcount.c @@ -487,5 +487,3 @@ main(int argc, char *argv[]) } return !!n_error; } - - |