diff options
| author |   Tony Lindgren <tony@atomide.com> | 2011-03-11 09:20:03 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-11 09:20:03 -0800 |
| commit | a2358a7bc35e388978fc2f7f6b071a0fd27d78c1 (patch) | |
| tree | fbdc2ddb066243a11aebc490c4d54e6a42be51e2 /drivers/scsi/mpt2sas/mpt2sas_ctl.c | |
| parent | Merge branch 'for_2.6.39/pm-misc' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus (diff) | |
| parent | Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integration-2.6.39-20110310-024 (diff) | |
| download | wireguard-linux-a2358a7bc35e388978fc2f7f6b071a0fd27d78c1.tar.xz wireguard-linux-a2358a7bc35e388978fc2f7f6b071a0fd27d78c1.zip | |
Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus
Conflicts:
arch/arm/mach-omap2/pm34xx.c
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_ctl.c')
0 files changed, 0 insertions, 0 deletions