diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 14:44:54 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 14:44:54 +0200 |
commit | fac778a2b8d6ca953d440baeee72901c2dd5aad9 (patch) | |
tree | c43d780b5ff8819f4353b16c99601c5ceeeacad7 /sound/ppc/beep.c | |
parent | 07862c1cd6675cde2dd4bd64e64d704ea2185b79 (diff) | |
parent | 94fc5d9de5bd757ad46f0d94bc4ebf617c4487f6 (diff) |
Merge branch 'linus' into timers/core
Reason: Get upstream changes on which new patches depend on.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'sound/ppc/beep.c')
0 files changed, 0 insertions, 0 deletions