]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: c9aaa18 090dfc3)
Merge branch 'uek-2.6.39-200' of git://ca-git.us.oracle.com/linux-uek-2.6.39 into...
authorMaxim Uvarov <maxim.uvarov@oracle.com>
Mon, 9 Jul 2012 10:11:39 +0000 (03:11 -0700)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Mon, 9 Jul 2012 10:11:39 +0000 (03:11 -0700)
commit2febd39263f5bc108a77a59c69f108949568ef92
treecaabdf1106525f960d16ffac40613e4400241d29tree
parentc9aaa184842cb9ab19b5a9dd63a345bb2e487be8commit | diff
parent090dfc37c60f54d8eed5a63a0edf8929da13e2ebcommit | diff
Merge branch 'uek-2.6.39-200' of git://ca-git.us.oracle.com/linux-uek-2.6.39 into master_stableup

Conflicts:
kernel/time/timekeeping.c
uek-rpm/ol5/kernel-uek.spec
uek-rpm/ol6/kernel-uek.spec

Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
kernel/time/timekeeping.c diff1 | diff2 | blob | history
uek-rpm/ol5/kernel-uek.spec diff1 | diff2 | blob | history
uek-rpm/ol6/kernel-uek.spec diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.