aboutsummaryrefslogtreecommitdiff
path: root/drivers/mtd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 15:39:49 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 15:39:49 -0700
commit93fdf10d4c28edaa1b9f80e7f9c3002359186d00 (patch)
tree4c5700b7f647470dcbb3b2a0531529ba35531b3d /drivers/mtd
parent22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 (diff)
parent0d8fdfd71bc871ffc07fe4429db8d4934185a8ec (diff)
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IB/core: Set alternate port number when initializing QP attributes IB/uverbs: Set correct user handle for user SRQs
Diffstat (limited to 'drivers/mtd')
0 files changed, 0 insertions, 0 deletions