Commit a1a1415e authored by Felix Blyakher's avatar Felix Blyakher
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

parents aaca4ff0 18e352e4

Documentation/filesystems/nfs-rdma.txt

+2 −2
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ NFS/RDMA Setup 


    Instruct the server to listen on the RDMA transport:



    $ echo rdma 2050 > /proc/fs/nfsd/portlist

    $ echo rdma 20049 > /proc/fs/nfsd/portlist



  - On the client system
@@ -263,7 +263,7 @@ NFS/RDMA Setup 
    Regardless of how the client was built (module or built-in), use this

    command to mount the NFS/RDMA server:



    $ mount -o rdma,port=2050 <IPoIB-server-name-or-address>:/<export> /mnt

    $ mount -o rdma,port=20049 <IPoIB-server-name-or-address>:/<export> /mnt



    To verify that the mount is using RDMA, run "cat /proc/mounts" and check

    the "proto" field for the given mount.

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 29

EXTRAVERSION = -rc2

EXTRAVERSION = -rc3

NAME = Erotic Pickled Herring



# *DOCUMENTATION*

arch/arm/mach-davinci/usb.c

+0 −23
Original line number Diff line number Diff line
@@ -77,29 +77,6 @@ static struct platform_device usb_dev = { 
	.num_resources  = ARRAY_SIZE(usb_resources),

};



#ifdef CONFIG_USB_MUSB_OTG



static struct otg_transceiver *xceiv;



struct otg_transceiver *otg_get_transceiver(void)

{

	if (xceiv)

		get_device(xceiv->dev);

	return xceiv;

}

EXPORT_SYMBOL(otg_get_transceiver);



int otg_set_transceiver(struct otg_transceiver *x)

{

	if (xceiv && x)

		return -EBUSY;

	xceiv = x;

	return 0;

}

EXPORT_SYMBOL(otg_set_transceiver);



#endif



void __init setup_usb(unsigned mA, unsigned potpgt_msec)

{

	usb_data.power = mA / 2;

arch/arm/mach-integrator/clock.h

deleted100644 → 0
+0 −0

Empty file deleted.

arch/m68k/include/asm/cacheflush_no.h

+9 −2
Original line number Diff line number Diff line
@@ -51,13 +51,20 @@ static inline void __flush_cache_all(void) 
		"movec	%%d0,%%CACR\n\t"

		: : : "d0", "a0" );

#endif /* CONFIG_M5407 */

#if defined(CONFIG_M527x) || defined(CONFIG_M528x)

#if defined(CONFIG_M523x) || defined(CONFIG_M527x)

	__asm__ __volatile__ (

		"movel	#0x81400100, %%d0\n\t"

		"movec	%%d0, %%CACR\n\t"

		"nop\n\t"

		: : : "d0" );

#endif /* CONFIG_M523x || CONFIG_M527x */

#if defined(CONFIG_M528x)

	__asm__ __volatile__ (

		"movel	#0x81000200, %%d0\n\t"

		"movec	%%d0, %%CACR\n\t"

		"nop\n\t"

		: : : "d0" );

#endif /* CONFIG_M527x || CONFIG_M528x */

#endif /* CONFIG_M528x */

#if defined(CONFIG_M5206) || defined(CONFIG_M5206e) || defined(CONFIG_M5272)

	__asm__ __volatile__ (

		"movel	#0x81000100, %%d0\n\t"