diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-22 15:21:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-22 15:21:18 +1100 |
| commit | f72c62136c75cf85345ef04bcb4bd4f85288ef70 (patch) | |
| tree | 9d68385c47ea2fd1d529ad33321641a5d41d8010 /drivers/rtc/rtc-proc.c | |
| parent | 900dca33d75a2c844ae8568ab02fe60da0b8cd29 (diff) | |
| parent | 99e621f796d7f0341a51e8cdf32b81663b10b448 (diff) | |
Merge remote-tracking branch 'signal/for-next'
Conflicts:
arch/mips/kernel/linux32.c
arch/tile/Kconfig
arch/tile/kernel/compat.c
include/asm-generic/unistd.h
Diffstat (limited to 'drivers/rtc/rtc-proc.c')
0 files changed, 0 insertions, 0 deletions