summaryrefslogtreecommitdiffstats
path: root/drivers/rtc/interface.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-03 20:19:26 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-03 20:19:26 +0100
commit9118626a30f8a3f58674623bebd3c34961e558af (patch)
tree9dac3d8f95f82b84c39695a648ee3a718daba676 /drivers/rtc/interface.c
parentMerge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentMerge branches 'amso1100', 'cma', 'cxgb4', 'misc', 'mlx4' and 'qib' into for-... (diff)
downloadlinux-9118626a30f8a3f58674623bebd3c34961e558af.tar.xz
linux-9118626a30f8a3f58674623bebd3c34961e558af.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: RDMA: Update missed conversion of flush_scheduled_work() RDMA/ucma: Copy iWARP route information on queries RDMA/amso1100: Fix compile warnings RDMA/cxgb4: Set the correct device physical function for iWARP connections RDMA/cxgb4: Limit MAXBURST EQ context field to 256B IB/qib: Hold link for TX SERDES settings mlx4_core: Add ConnectX-3 device IDs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions