diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-14 09:59:00 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-14 09:59:30 -0400 |
| commit | 4cd1993f0046fbc765dbf20af90966f5661e3789 (patch) | |
| tree | 8772c03b73159524183f08337b134503ddf8479e /kernel/time/Makefile | |
| parent | 97fd9ed48ce2b807edc363bef3e817aeeb5cd5e6 (diff) | |
| parent | 64f1607ffbbc772685733ea63e6f7f4183df1b16 (diff) | |
Merge branch 'linus' into timers/core
Reason: Martin's timekeeping cleanup series depends on both
timers/core and mainline changes.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time/Makefile')
0 files changed, 0 insertions, 0 deletions