]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: b4a200a e38bca6)
Merge branch 'm-master-v3.0.42' of git://ca-git.us.oracle.com/linux-muvarov-public...
authorMaxim Uvarov <maxim.uvarov@oracle.com>
Mon, 8 Oct 2012 12:43:55 +0000 (05:43 -0700)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Mon, 8 Oct 2012 12:43:55 +0000 (05:43 -0700)
commit388b81c109a53ff310cca9020e3a90677b24ea47
treeacb8447f95e6638e763096a4d21c5cdaab742baetree
parentb4a200ab96afba185d6713749a5873c53abf3f67commit | diff
parente38bca6f09f542f85fdcd200d4c9a2248dce76ffcommit | diff
Merge branch 'm-master-v3.0.42' of git://ca-git.us.oracle.com/linux-muvarov-public into m-master

Merge 3.0.42 and 3.0.43 commits.
Conflicts:
fs/buffer.c

Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
drivers/pci/pci-driver.c diff1 | diff2 | blob | history
drivers/scsi/scsi_error.c diff1 | diff2 | blob | history
drivers/scsi/scsi_scan.c diff1 | diff2 | blob | history
fs/buffer.c diff1 | diff2 | blob | history
mm/mempolicy.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.