]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: f7670f5 a67bee2)
Merge branch 'v2.6.39-100.0.17.bug13459661_13465921' of git://ca-git.us.oracle.com...
authorGuru Anbalagane <guru.anbalagane@oracle.com>
Mon, 19 Dec 2011 07:09:07 +0000 (23:09 -0800)
committerGuru Anbalagane <guru.anbalagane@oracle.com>
Mon, 19 Dec 2011 07:09:07 +0000 (23:09 -0800)
commit4475090f27d3be23c1d41dbdbef29d418c9d5fdd
treec83ce99bb5a38c043b499bfba619d6d531570c97tree
parentf7670f51bbea6a2c438a7eae9f941ad71521d743commit | diff
parenta67bee24442428696a85286a362d4d06e0f3988dcommit | diff
Merge branch 'v2.6.39-100.0.17.bug13459661_13465921' of git://ca-git.us.oracle.com/linux-chander-public into uek2-stable

Conflicts:
drivers/scsi/be2iscsi/be_main.c

Signed-off-by: Guru Anbalagane <guru.anbalagane@oracle.com>
drivers/scsi/be2iscsi/be_iscsi.c diff1 | diff2 | blob | history
drivers/scsi/be2iscsi/be_main.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.