diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2011-05-18 20:59:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-18 20:59:30 +0200 |
| commit | 01ed58abec07633791f03684b937a7e22e00c9bb (patch) | |
| tree | 7bb5b60c102aa08e404928ffcb3edf1e8404b5a2 /drivers/rtc/rtc-s3c.c | |
| parent | Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core (diff) | |
| parent | x86, 64-bit: Fix copy_[to/from]_user() checks for the userspace address limit (diff) | |
| download | linux-dev-01ed58abec07633791f03684b937a7e22e00c9bb.tar.xz linux-dev-01ed58abec07633791f03684b937a7e22e00c9bb.zip | |
Merge branch 'x86/mem' into perf/core
Merge reason: memcpy_64.S changes an assumption perf bench has, so merge this
here so we can fix it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/rtc/rtc-s3c.c')
0 files changed, 0 insertions, 0 deletions