]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'v2.6.39-300.5.0.ol5_bug13910619#ocfs2_for_uek_v5' into master_igb
authorMaxim Uvarov <maxim.uvarov@oracle.com>
Wed, 29 Aug 2012 14:30:05 +0000 (07:30 -0700)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Wed, 29 Aug 2012 14:30:15 +0000 (07:30 -0700)
Orabug: 13910619
Merge  git://ca-git.us.oracle.com/linux-xiaowhu-public.git v2.6.39-300.5.0.ol5_bug13910619#ocfs2_for_uek_v5


Trivial merge