Skip to content
GitLab
Commit a5a64498 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.28-rc4' into timers/rtc 

Conflicts:
	drivers/rtc/rtc-cmos.c
parents bb93d802 f7160c75
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment