diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-04-24 20:33:46 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-04-24 20:33:54 +0200 |
| commit | 6402c7dc2a19c19bd8cdc7d80878b850da418942 (patch) | |
| tree | cda2ea2df40442e2aa016119f3548cc504127ea8 /arch/x86/include/asm/atomic.h | |
| parent | timekeeping: Update tk->cycle_last in resume (diff) | |
| parent | Linux 3.9-rc8 (diff) | |
| download | linux-6402c7dc2a19c19bd8cdc7d80878b850da418942.tar.xz linux-6402c7dc2a19c19bd8cdc7d80878b850da418942.zip | |
Merge branch 'linus' into timers/core
Reason: Get upstream fixes before adding conflicting code.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm/atomic.h')
0 files changed, 0 insertions, 0 deletions